opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10851 from rainzm/syncaccount/localtask

Browse Source 
fix(region): avoid using LocalTaskWorker in time-consuming synchronization of cloudaccount
This commit is contained in:
Zexi Li
2021-04-21 10:09:28 +08:00
committed by GitHub
parent e5d94d3b17 ea790cc82b
commit 32ec7f68b1
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/cloud_provider_sync_info_task.go
+7 -15
View File
@@ -94,25 +94,17 @@ func (self *CloudProviderSyncInfoTask) OnSyncCloudProviderPreInfoComplete(ctx co
syncRange := self.GetSyncRange()
db.OpsLog.LogEvent(provider, db.ACT_SYNCING_HOST, "", self.UserCred)
self.SetStage("OnSyncCloudProviderInfoComplete", nil)
taskman.LocalTaskRun(self, func() (jsonutils.JSONObject, error) {
provider.SyncCallSyncCloudproviderRegions(ctx, self.UserCred, syncRange)
provider.SyncCallSyncCloudproviderInterVpcNetwork(ctx, self.UserCred)
return nil, nil
})
provider.SyncCallSyncCloudproviderRegions(ctx, self.UserCred, syncRange)
provider.SyncCallSyncCloudproviderInterVpcNetwork(ctx, self.UserCred)
provider.CleanSchedCache()
self.SetStageComplete(ctx, nil)
db.OpsLog.LogEvent(provider, db.ACT_SYNC_HOST_COMPLETE, "", self.UserCred)
logclient.AddActionLogWithStartable(self, provider, getAction(self.Params), body, self.UserCred, true)
}
func (self *CloudProviderSyncInfoTask) OnSyncCloudProviderPreInfoCompleteFailed(ctx context.Context, obj db.IStandaloneModel, body jsonutils.JSONObject) {
log.Errorf("faild to sync provider quotas %s", body.String())
self.OnSyncCloudProviderPreInfoComplete(ctx, obj, body)
}
func (self *CloudProviderSyncInfoTask) OnSyncCloudProviderInfoComplete(ctx context.Context, obj db.IStandaloneModel, body jsonutils.JSONObject) {
provider := obj.(*models.SCloudprovider)
// provider.MarkEndSync(self.UserCred)
provider.CleanSchedCache()
self.SetStageComplete(ctx, nil)
db.OpsLog.LogEvent(provider, db.ACT_SYNC_HOST_COMPLETE, "", self.UserCred)
logclient.AddActionLogWithStartable(self, provider, getAction(self.Params), body, self.UserCred, true)
}