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 #7036 from swordqiu/hotfix/qj-cloud-account-sync-sync

Browse Source 
fix: cloud account sync may block
This commit is contained in:
Zexi Li
2020-07-04 10:39:22 +08:00
committed by GitHub
parent cb8fcac618 1985aab894
commit 60cb128ab3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudaccounts.go
+3 -1
View File
@@ -2368,6 +2368,7 @@ func (account *SCloudaccount) SubmitSyncAccountTask(ctx context.Context, userCre
if _, ok := cloudaccountPendingSyncs[account.Id]; ok {
if waitChan != nil {
// 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")
}
return
@@ -2386,8 +2387,9 @@ func (account *SCloudaccount) SubmitSyncAccountTask(ctx context.Context, userCre
if waitChan != nil {
if err != nil {
account.markEndSync(userCred)
err = errors.Wrap(err, "account.syncAccountStatus")
}
waitChan <- errors.Wrap(err, "account.syncAccountStatus")
waitChan <- err
} else {
syncCnt := 0
if err == nil && autoSync && account.GetEnabled() && account.EnableAutoSync {