Merge pull request #5 from elatt/master

Fix scaling to respect numExecutors
awslabs · Jul 21, 2017 · 4b06b32 · 4b06b32
2 parents 64609a2 + fb2ab3f
commit 4b06b32
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/com/amazon/jenkins/ec2fleet/EC2FleetCloud.java b/src/main/java/com/amazon/jenkins/ec2fleet/EC2FleetCloud.java
@@ -209,14 +209,17 @@ public static void log(final Logger logger, final Level level,
         if (stats.getNumDesired() >= maxAllowed || !"active".equals(stats.getState()))
             return Collections.emptyList();
 
-        int targetCapacity = stats.getNumDesired() + excessWorkload;
+	// Presumably ceil() would also be correct but I think round() works best for
+	// scenarios when numExecutors is of reasonable size.
+        int weightedExcessWorkload = Math.round((float)excessWorkload / this.numExecutors);
+        int targetCapacity = stats.getNumDesired() + weightedExcessWorkload;
 
         if (targetCapacity > maxAllowed)
             targetCapacity = maxAllowed;
 
         int toProvision = targetCapacity - stats.getNumDesired();
 
-        LOGGER.log(Level.INFO, "Provisioning nodes. Excess workload: " + Integer.toString(excessWorkload) + ", Provisioning: " + Integer.toString(toProvision));
+        LOGGER.log(Level.INFO, "Provisioning nodes. Excess workload: " + Integer.toString(weightedExcessWorkload) + ", Provisioning: " + Integer.toString(toProvision));
 
         final ModifySpotFleetRequestRequest request=new ModifySpotFleetRequestRequest();
         request.setSpotFleetRequestId(fleet);
@@ -231,7 +234,7 @@ public static void log(final Logger logger, final Level level,
         {
             final SettableFuture<Node> futureNode=SettableFuture.create();
             final NodeProvisioner.PlannedNode plannedNode=
-                    new NodeProvisioner.PlannedNode("FleetNode-"+f, futureNode, 1);
+                    new NodeProvisioner.PlannedNode("FleetNode-"+f, futureNode, this.numExecutors);
             resultList.add(plannedNode);
             this.plannedNodes.add(plannedNode);
         }