Add count of builds left for instances (#305)

jenkinsci · Nov 9, 2021 · 8c02bb0 · 8c02bb0
1 parent 9a0fc90
commit 8c02bb0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/com/amazon/jenkins/ec2fleet/EC2FleetNodeComputer.java b/src/main/java/com/amazon/jenkins/ec2fleet/EC2FleetNodeComputer.java
@@ -40,8 +40,19 @@ public EC2FleetNode getNode() {
     @Nonnull
     @Override
     public String getDisplayName() {
+        if(cloud != null) {
+            final String displayName = String.format("%s %s", cloud.getDisplayName(), name);
+            final EC2FleetNode node = getNode();
+            if(node != null) {
+                final int totalUses = node.getMaxTotalUses();
+                if(totalUses != -1) {
+                    return String.format("%s Builds left: %d ", displayName, totalUses);
+                }
+            }
+            return displayName;
+        }
         // in some multi-thread edge cases cloud could be null for some time, just be ok with that
-        return (cloud == null ? "unknown fleet" : cloud.getDisplayName()) + " " + name;
+        return "unknown fleet" + " " + name;
     }
 
     /**

diff --git a/src/main/java/com/amazon/jenkins/ec2fleet/EC2RetentionStrategy.java b/src/main/java/com/amazon/jenkins/ec2fleet/EC2RetentionStrategy.java
@@ -106,6 +106,7 @@ public void taskAccepted(Executor executor, Queue.Task task) {
                 } else if (maxTotalUses <= 1) {
                     LOGGER.info("maxTotalUses drained - suspending agent after current build " + computer.getName());
                     computer.setAcceptingTasks(false);
+                    ec2FleetNode.setMaxTotalUses(ec2FleetNode.getMaxTotalUses() - 1);
                 } else {
                     ec2FleetNode.setMaxTotalUses(ec2FleetNode.getMaxTotalUses() - 1);
                     LOGGER.info("Agent " + computer.getName() + " has " + ec2FleetNode.getMaxTotalUses() + " builds left");