Automatic merge from release/2.2.0 -> release/2.3.0

* commit 'fc0f8abb49fe7ffcecb09e7cde03bbc6736d60c7':
  避免出现多个externalID相同的快照
This commit is contained in:
邱剑
2018-12-29 12:49:39 +08:00
+1 -1
View File
@@ -516,7 +516,7 @@ func (manager *SSnapshotManager) getProviderSnapshotsByRegion(region *SCloudregi
return nil, fmt.Errorf("Region is nil or provider is nil")
}
snapshots := make([]SSnapshot, 0)
q := manager.Query().Equals("cloudregion_id", region.Id).Equals("manager_id", provider.Id).NotEquals("status", SNAPSHOT_UNKNOWN)
q := manager.Query().Equals("cloudregion_id", region.Id).Equals("manager_id", provider.Id)
err := db.FetchModelObjects(manager, q, &snapshots)
if err != nil {
return nil, err