Merge pull request #11955 from ioito/automated-cherry-pick-of-#11954-upstream-release-3.7

Automated cherry pick of #11954: fix(region): sync with multi worker
This commit is contained in:
Zexi Li
2021-08-19 16:11:59 +08:00
committed by GitHub
+1 -8
View File
@@ -409,14 +409,7 @@ func (self *SCloudproviderregion) DoSync(ctx context.Context, userCred mcclient.
}
func (self *SCloudproviderregion) getSyncTaskKey() string {
region, err := self.GetRegion()
if err != nil {
return self.CloudregionId
}
if len(region.ExternalId) > 0 {
return region.ExternalId
}
return self.CloudproviderId
return fmt.Sprintf("%d", self.RowId)
}
func (self *SCloudproviderregion) submitSyncTask(ctx context.Context, userCred mcclient.TokenCredential, syncRange SSyncRange, waitChan chan bool) {