Automatic merge from release/2.4.0 -> release/2.5.0

* commit 'b7842d96bd722a0a7dfc874852260269c70debbf':
  exclude terminated vm

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
 }
 

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)