14291: Exclude both "shutting-down" and "terminated" instances.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/lib/cloud/ec2/ec2.go b/lib/cloud/ec2/ec2.go
index d970993676d9575b7e7c9f150b6a940948f1d11e..98e66c821346ff21a86292c5b916bbbe6eb245c8 100644 (file)
--- a/lib/cloud/ec2/ec2.go
+++ b/lib/cloud/ec2/ec2.go
@@ -245,7 +245,7 @@ func (instanceSet *ec2InstanceSet) Instances(cloud.InstanceTags) (instances []cl
 
                for _, rsv := range dio.Reservations {
                        for _, inst := range rsv.Instances {
-                               if *inst.State.Name != "terminated" {
+                               if *inst.State.Name != "shutting-down" && *inst.State.Name != "terminated" {
                                        instances = append(instances, &ec2Instance{instanceSet, inst})
                                }
                        }