From 992dbb7550c76edcefbfd5ac92c954d8141df28d Mon Sep 17 00:00:00 2001
From: TangBin <tangbin@yunionyun.com>
Date: Wed, 19 Dec 2018 18:33:22 +0800
Subject: [PATCH] exclude terminated vm

---
 pkg/compute/models/skus.go | 1 +
 pkg/util/aws/instance.go   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/compute/models/skus.go b/pkg/compute/models/skus.go
index 0bb206cc71..fa26fe3d1d 100644
--- a/pkg/compute/models/skus.go
+++ b/pkg/compute/models/skus.go
@@ -472,6 +472,7 @@ func (manager *SServerSkuManager) ListItemFilter(ctx context.Context, q *sqlchem
 		queryDict.Remove("zone_id")
 	}
 
+	q = q.Asc(q.Field("cpu_core_count"), q.Field("memory_size_mb"))
 	return q, err
 }
 
diff --git a/pkg/util/aws/instance.go b/pkg/util/aws/instance.go
index 6e7179b2c4..9ba780086d 100644
--- a/pkg/util/aws/instance.go
+++ b/pkg/util/aws/instance.go
@@ -422,7 +422,6 @@ func (self *SRegion) GetInstances(zoneId string, ids []string, offset int, limit
 		}
 	}
 
-	// todo: 不同步已经terminated的主机
 	instances := []SInstance{}
 	for _, reservation := range res.Reservations {
 		for _, instance := range reservation.Instances {
@@ -430,6 +429,11 @@ func (self *SRegion) GetInstances(zoneId string, ids []string, offset int, limit
 				return nil, 0, err
 			}
 
+			// 不同步已经terminated的主机
+			if *instance.State.Name == ec2.InstanceStateNameTerminated {
+				continue
+			}
+
 			tagspec := TagSpec{}
 			tagspec.LoadingEc2Tags(instance.Tags)