opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14076 from ioito/hotfix/qx-account-sync

Browse Source 
fix(region): account sync
This commit is contained in:
Zexi Li
2022-04-19 19:43:31 +08:00
committed by GitHub
parent 826794d747 e99a0de489
commit 8d5457b79b
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudaccounts.go
+11 -7
View File
@@ -665,7 +665,7 @@ func (self *SCloudaccount) PerformSync(ctx context.Context, userCred mcclient.To
if self.CanSync() || syncRange.Force {
return nil, self.StartSyncCloudProviderInfoTask(ctx, userCred, &syncRange, "")
}
return nil, nil
return nil, httperrors.NewInvalidStatusError("Unable to synchronize frequently")
}
// 测试账号连通性(更新秘钥信息时)
@@ -847,14 +847,21 @@ func (self *SCloudaccount) StartSyncCloudProviderInfoTask(ctx context.Context, u
params.Add(jsonutils.Marshal(syncRange), "sync_range")
}
cloudaccountPendingSyncsMutex.Lock()
defer cloudaccountPendingSyncsMutex.Unlock()
// 提前判断是否云账号已经在后台进行同步
if _, ok := cloudaccountPendingSyncs[self.Id]; ok {
return errors.Wrap(httperrors.ErrConflict, "account alread in syncing")
}
task, err := taskman.TaskManager.NewTask(ctx, "CloudAccountSyncInfoTask", self, userCred, params, "", "", nil)
if err != nil {
return errors.Wrapf(err, "NewTask")
}
self.markStartSync(userCred, syncRange)
db.OpsLog.LogEvent(self, db.ACT_SYNC_HOST_START, "", userCred)
task.ScheduleRun(nil)
return nil
return task.ScheduleRun(nil)
}
func (self *SCloudaccount) markStartSync(userCred mcclient.TokenCredential, syncRange *SSyncRange) error {
@@ -2236,9 +2243,7 @@ func (account *SCloudaccount) SubmitSyncAccountTask(ctx context.Context, userCre
if _, ok := cloudaccountPendingSyncs[account.Id]; ok {
if waitChan != nil {
go func() {
// an active cloudaccount sync task is running, return with conflict error
log.Errorf("an active cloudaccount sync task is running, early return with conflict error")
waitChan <- errors.Wrap(httperrors.ErrConflict, "cloudaccountPendingSyncs")
waitChan <- errors.Wrap(httperrors.ErrConflict, "an active cloudaccount sync task is running, early return with conflict error")
}()
}
return
@@ -2421,7 +2426,6 @@ func (account *SCloudaccount) PerformPublic(ctx context.Context, userCred mcclie
},
}
account.StartSyncCloudProviderInfoTask(ctx, userCred, syncRange, "")
return nil, nil
}
pkg/compute/tasks/cloud_account_sync_task.go
+4 -4
View File
@@ -47,12 +47,12 @@ func (self *CloudAccountSyncInfoTask) OnInit(ctx context.Context, obj db.IStanda
taskman.LocalTaskRun(self, func() (jsonutils.JSONObject, error) {
// do sync
err := cloudaccount.SyncCallSyncAccountTask(ctx, self.UserCred)
if err != nil {
if errors.Cause(err) != httperrors.ErrConflict {
log.Debugf("no other sync task, mark end sync for all cloudproviders")
cloudaccount.MarkEndSyncWithLock(ctx, self.UserCred)
if errors.Cause(err) == httperrors.ErrConflict {
log.Errorf("account %s(%s) alread in syncing", cloudaccount.Name, cloudaccount.Provider)
}
// 进入同步任务前已经mark sync, 这里需要清理下状态
cloudaccount.MarkEndSyncWithLock(ctx, self.UserCred)
return nil, errors.Wrap(err, "SyncCallSyncAccountTask")
}
return nil, nil