Skip to content
This repository was archived by the owner on Mar 31, 2023. It is now read-only.

Commit 3c1d8fc

Browse files
authored
Maintenance (#180)
* remove sudo param from travisci config; closes #179 * upgrade gradle wrapper and netflixoss plugin * change info log statements to debug add experimental api for evaluating assignable VMs fix javadoc for disabling VMs; closes 178
1 parent 5f49f98 commit 3c1d8fc

File tree

11 files changed

+423
-399
lines changed

11 files changed

+423
-399
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: java
22
jdk:
33
- oraclejdk8
4-
sudo: false
54
install: ./installViaTravis.sh
65
script: ./buildViaTravis.sh
76
env:

build.gradle

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ buildscript {
2424
}
2525
}
2626
dependencies {
27-
classpath 'com.netflix.nebula:gradle-netflixoss-project-plugin:3.5.2'
27+
classpath 'com.netflix.nebula:gradle-netflixoss-project-plugin:5.0.0'
2828
}
2929
}
3030

@@ -58,4 +58,8 @@ subprojects {
5858
tasks.withType(Javadoc) {
5959
options.addStringOption('Xdoclint:none', '-quiet')
6060
}
61+
62+
test {
63+
maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
64+
}
6165
}

fenzo-core/src/main/java/com/netflix/fenzo/AssignableVMs.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ void purgeInactiveVMs(Set<String> excludeVms) {
346346
vmCollection.remove(avm);
347347
if (avm.getCurrVMId() != null)
348348
vmIdToHostnameMap.remove(avm.getCurrVMId(), avm.getHostname());
349-
logger.info("Removed inactive host " + avm.getHostname());
349+
logger.debug("Removed inactive host " + avm.getHostname());
350350
}
351351
}
352352
}

fenzo-core/src/main/java/com/netflix/fenzo/AssignableVirtualMachine.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ private void assignResourceSets(TaskRequest request) {
492492
}
493493

494494
void expireLease(String leaseId) {
495-
logger.info("Got request to expire lease on " + hostname);
495+
logger.debug("Got request to expire lease on " + hostname);
496496
leasesToExpire.offer(leaseId);
497497
}
498498

fenzo-core/src/main/java/com/netflix/fenzo/TaskScheduler.java

+253-212
Large diffs are not rendered by default.

fenzo-core/src/main/java/com/netflix/fenzo/TaskSchedulingService.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,7 @@ private TaskSchedulingService(Builder builder) {
136136
* new leases.
137137
*/
138138
public void start() {
139-
executorService.scheduleWithFixedDelay(new Runnable() {
140-
@Override
141-
public void run() {
142-
TaskSchedulingService.this.scheduleOnce();
143-
}
144-
}, 0, loopIntervalMillis, TimeUnit.MILLISECONDS);
139+
executorService.scheduleWithFixedDelay(TaskSchedulingService.this::scheduleOnce, 0, loopIntervalMillis, TimeUnit.MILLISECONDS);
145140
}
146141

147142
/**

fenzo-core/src/main/java/com/netflix/fenzo/queues/tiered/Tier.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ public void setTotalResources(Map<VMResource, Double> totalResourcesMap) {
300300
for (QueueBucket b : sortedBuckets.getSortedList()) {
301301
b.setTotalResources(tierResources);
302302
}
303-
logger.info("Re-sorting buckets in tier " + tierNumber + " after totals changed");
303+
logger.debug("Re-sorting buckets in tier " + tierNumber + " after totals changed");
304304
sortedBuckets.resort();
305305
}
306306
}

fenzo-core/src/test/java/com/netflix/fenzo/BinPackingSchedulerTests.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,7 @@ private TaskScheduler getScheduler(VMTaskFitnessCalculator fitnessCalculator) {
4545
return new TaskScheduler.Builder()
4646
.withFitnessCalculator(fitnessCalculator)
4747
.withLeaseOfferExpirySecs(1000000)
48-
.withLeaseRejectAction(new Action1<VirtualMachineLease>() {
49-
@Override
50-
public void call(VirtualMachineLease virtualMachineLease) {
51-
logger.info("Rejecting lease on " + virtualMachineLease.hostname());
52-
}
53-
})
48+
.withLeaseRejectAction(virtualMachineLease -> logger.info("Rejecting lease on " + virtualMachineLease.hostname()))
5449
.build();
5550
}
5651

fenzo-core/src/test/java/com/netflix/fenzo/TaskSchedulingServiceTest.java

+158-168
Large diffs are not rendered by default.

gradle/wrapper/gradle-wrapper.jar

3.24 KB
Binary file not shown.
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Mar 12 15:36:03 PDT 2015
1+
#Thu May 17 12:49:38 PDT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 commit comments

Comments
 (0)