From acad6755554a9cd4ea9a7f18808e45a5464e48f7 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Mon, 26 Apr 2021 14:47:07 +0800 Subject: [PATCH] fix(region): sync multi region resource at same time --- pkg/compute/models/cloudproviderregions.go | 5 +---- pkg/compute/models/cloudproviders.go | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkg/compute/models/cloudproviderregions.go b/pkg/compute/models/cloudproviderregions.go index 451a7c84f4..239988be2e 100644 --- a/pkg/compute/models/cloudproviderregions.go +++ b/pkg/compute/models/cloudproviderregions.go @@ -427,7 +427,7 @@ func (self *SCloudproviderregion) getSyncTaskKey() string { } } -func (self *SCloudproviderregion) submitSyncTask(ctx context.Context, userCred mcclient.TokenCredential, syncRange SSyncRange, waitChan chan bool) { +func (self *SCloudproviderregion) submitSyncTask(ctx context.Context, userCred mcclient.TokenCredential, syncRange SSyncRange) { self.markStartSync(userCred) RunSyncCloudproviderRegionTask(ctx, self.getSyncTaskKey(), func() { nopanic.Run(func() { @@ -437,9 +437,6 @@ func (self *SCloudproviderregion) submitSyncTask(ctx context.Context, userCred m log.Errorf("DoSync faild %v", err) } }) - if waitChan != nil { - waitChan <- true - } }) } diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index 2aad6f56f3..6c6603921c 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -1333,14 +1333,11 @@ func (provider *SCloudprovider) syncCloudproviderRegions(ctx context.Context, us for i := range cprs { if cprs[i].Enabled && cprs[i].CanSync() && (!autoSync || cprs[i].needAutoSync()) && (len(regionIds) == 0 || utils.IsInStringArray(cprs[i].CloudregionId, regionIds)) { syncCnt += 1 - var waitChan chan bool = nil if wg != nil { wg.Add(1) - waitChan = make(chan bool) } - cprs[i].submitSyncTask(ctx, userCred, syncRange, waitChan) + cprs[i].submitSyncTask(ctx, userCred, syncRange) if wg != nil { - <-waitChan wg.Done() } }