lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-07-01 02:24:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): avoid panic when locking

Browse Source
This commit is contained in:
rainzm
2021-07-22 10:23:20 +08:00
parent f266d883dd
commit 3485be17e5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/compute/models/storages.go
View File

@@ -688,8 +688,14 @@ func (manager *SStorageManager) scanLegacyStorages() error {
}
func (manager *SStorageManager) SyncStorages(ctx context.Context, userCred mcclient.TokenCredential, provider *SCloudprovider, zone *SZone, storages []cloudprovider.ICloudStorage) ([]SStorage, []cloudprovider.ICloudStorage, compare.SyncResult) {
lockman.LockRawObject(ctx, "storages", fmt.Sprintf("%s-%s", provider.Id, zone.Id))
defer lockman.ReleaseRawObject(ctx, "storages", fmt.Sprintf("%s-%s", provider.Id, zone.Id))
var resId string
if zone != nil {
resId = fmt.Sprintf("%s-%s", provider.Id, zone.Id)
} else {
resId = provider.Id
}
lockman.LockRawObject(ctx, "storages", resId)
defer lockman.ReleaseRawObject(ctx, "storages", resId)
localStorages := make([]SStorage, 0)
remoteStorages := make([]cloudprovider.ICloudStorage, 0)