[ARVADOS] updated: 1.3.0-411-g4cb692fff

[Git user]

Summary of changes:
 lib/cloud/ec2/ec2.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  4cb692fff4953a4a69ea2fb50ec29a8f5e9c9951 (commit)
      from  dc6c729a9e738d876642f2153e1fedd05878245a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4cb692fff4953a4a69ea2fb50ec29a8f5e9c9951
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Mar 7 16:53:14 2019 -0500

    14291: Exclude both "shutting-down" and "terminated" instances.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/lib/cloud/ec2/ec2.go b/lib/cloud/ec2/ec2.go
index d97099367..98e66c821 100644
--- 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})
 				}
 			}

-----------------------------------------------------------------------


hooks/post-receive
--