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 #1741 from ioito/hotfix/qx-mark-cloudproviderregions-status

Browse Source 
避免设置disable的cloudproviderregion状态
This commit is contained in:
yunion-ci-robot
2019-07-15 21:36:59 +08:00
committed by GitHub
parent 065334e3f4 568e6ae387
commit aed5e4cd58
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudproviderregions.go
+10
View File
@@ -17,6 +17,7 @@ package models
import (
"context"
"database/sql"
"fmt"
"math/rand"
"time"
@@ -223,6 +224,9 @@ func (manager *SCloudproviderregionManager) FetchByIdsOrCreate(providerId string
}
func (self *SCloudproviderregion) markStartingSync(userCred mcclient.TokenCredential) error {
if !self.Enabled {
return fmt.Errorf("Cloudprovider(%s)region(%s) disabled", self.CloudproviderId, self.CloudregionId)
}
_, err := db.Update(self, func() error {
self.SyncStatus = compute.CLOUD_PROVIDER_SYNC_STATUS_QUEUING
return nil
@@ -235,6 +239,9 @@ func (self *SCloudproviderregion) markStartingSync(userCred mcclient.TokenCreden
}
func (self *SCloudproviderregion) markStartSync(userCred mcclient.TokenCredential) error {
if !self.Enabled {
return fmt.Errorf("Cloudprovider(%s)region(%s) disabled", self.CloudproviderId, self.CloudregionId)
}
_, err := db.Update(self, func() error {
self.SyncStatus = compute.CLOUD_PROVIDER_SYNC_STATUS_QUEUED
return nil
@@ -247,6 +254,9 @@ func (self *SCloudproviderregion) markStartSync(userCred mcclient.TokenCredentia
}
func (self *SCloudproviderregion) markSyncing(userCred mcclient.TokenCredential) error {
if !self.Enabled {
return fmt.Errorf("Cloudprovider(%s)region(%s) disabled", self.CloudproviderId, self.CloudregionId)
}
_, err := db.Update(self, func() error {
self.SyncStatus = compute.CLOUD_PROVIDER_SYNC_STATUS_SYNCING
self.LastSync = timeutils.UtcNow()
pkg/compute/models/cloudproviders.go
+10 -6
View File
@@ -591,9 +591,11 @@ func (self *SCloudprovider) markStartingSync(userCred mcclient.TokenCredential)
}
cprs := self.GetCloudproviderRegions()
for i := range cprs {
err := cprs[i].markStartingSync(userCred)
if err != nil {
return errors.Wrap(err, "cprs[i].markStartingSync")
if cprs[i].Enabled {
err := cprs[i].markStartingSync(userCred)
if err != nil {
return errors.Wrap(err, "cprs[i].markStartingSync")
}
}
}
return nil
@@ -610,9 +612,11 @@ func (self *SCloudprovider) markStartSync(userCred mcclient.TokenCredential) err
}
cprs := self.GetCloudproviderRegions()
for i := range cprs {
err := cprs[i].markStartingSync(userCred)
if err != nil {
return errors.Wrap(err, "cprs[i].markStartingSync")
if cprs[i].Enabled {
err := cprs[i].markStartingSync(userCred)
if err != nil {
return errors.Wrap(err, "cprs[i].markStartingSync")
}
}
}
return nil