[FIXED JENKINS-7883] Stopped (as opposed to terminated) slaves are co…

…unted against the active instance count for the purpose of launching; can prevent launching of instances
jenkinsci · Feb 15, 2012 · fb48500653bf851b59022b61ed3eb86ac60ab07f · fb48500
1 parent f13f065
commit fb48500653bf851b59022b61ed3eb86ac60ab07f
Unified Split

Showing with 3 additions and 1 deletion.

+3 −1 src/main/java/hudson/plugins/ec2/EC2Cloud.java
diff --git a/src/main/java/hudson/plugins/ec2/EC2Cloud.java b/src/main/java/hudson/plugins/ec2/EC2Cloud.java
@@ -39,6 +39,7 @@
 import com.amazonaws.services.ec2.AmazonEC2Client;
 import com.amazonaws.services.ec2.model.CreateKeyPairRequest;
 import com.amazonaws.services.ec2.model.Instance;
+  
+import com.amazonaws.services.ec2.model.InstanceStateName;
 import com.amazonaws.services.ec2.model.InstanceType;
 import com.amazonaws.services.ec2.model.KeyPair;
 import com.amazonaws.services.ec2.model.KeyPairInfo;
@@ -152,7 +153,8 @@ public int countCurrentEC2Slaves() throws AmazonClientException {
        int n=0;
        for (Reservation r : connect().describeInstances().getReservations()) {
            for (Instance i : r.getInstances()) {
-  
-                if(!"terminated".equals(i.getState().getName()))
+  
+                InstanceStateName stateName = InstanceStateName.fromValue(i.getState().getName());
+  
+                if (stateName == InstanceStateName.Pending || stateName == InstanceStateName.Running)
                    n++;
            }
        }