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 #10997 from rainzm/automated-cherry-pick-of-#10996-upstream-release-3.7

Browse Source 
Automated cherry pick of #10996: fix(region): continue to sync the snapshots that are being created when syncing auto created snapshot
This commit is contained in:
Zexi Li
2021-05-10 12:05:44 +08:00
committed by GitHub
parent 4bf6f20710 eb049034c2
commit 7430f82f8e
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/disks.go
+18 -8
View File
@@ -2530,11 +2530,15 @@ func (manager *SDiskManager) AutoSyncExtDiskSnapshot(ctx context.Context, userCr
continue
}
disk := obj.(*SDisk)
syncResult := disk.syncSnapshots(ctx, userCred)
syncResult, hasCreating := disk.syncSnapshots(ctx, userCred)
if syncResult.IsError() {
db.OpsLog.LogEvent(disk, db.ACT_DISK_AUTO_SYNC_SNAPSHOT_FAIL, syncResult.Result(), userCred)
continue
}
if hasCreating {
// There are snapshots that are being created and need to be synchronized next time
continue
}
sp := spMap[spd.SnapshotpolicyId]
repeatWeekdays := SnapshotPolicyManager.RepeatWeekdaysToIntArray(sp.RepeatWeekdays)
timePoints := SnapshotPolicyManager.TimePointsToIntArray(sp.TimePoints)
@@ -2564,27 +2568,27 @@ func isInInts(a int, array []int) bool {
return false
}
func (self *SDisk) syncSnapshots(ctx context.Context, userCred mcclient.TokenCredential) compare.SyncResult {
syncResult := compare.SyncResult{}
func (self *SDisk) syncSnapshots(ctx context.Context, userCred mcclient.TokenCredential) (syncResult compare.SyncResult, hasCreating bool) {
syncResult = compare.SyncResult{}
extDisk, err := self.GetIDisk()
if err != nil {
syncResult.Error(err)
return syncResult
return
}
provider := self.GetCloudprovider()
syncOwnerId := provider.GetOwnerId()
storage := self.GetStorage()
if storage == nil {
syncResult.Error(fmt.Errorf("no valid storage"))
return syncResult
return
}
region := storage.GetRegion()
extSnapshots, err := extDisk.GetISnapshots()
if err != nil {
syncResult.Error(err)
return syncResult
return
}
localSnapshots := SnapshotManager.GetDiskSnapshots(self.Id)
@@ -2599,7 +2603,7 @@ func (self *SDisk) syncSnapshots(ctx context.Context, userCred mcclient.TokenCre
err = compare.CompareSets(localSnapshots, extSnapshots, &removed, &commondb, &commonext, &added)
if err != nil {
syncResult.Error(err)
return syncResult
return
}
for i := 0; i < len(removed); i += 1 {
err = removed[i].syncRemoveCloudSnapshot(ctx, userCred)
@@ -2617,6 +2621,9 @@ func (self *SDisk) syncSnapshots(ctx context.Context, userCred mcclient.TokenCre
syncMetadata(ctx, userCred, &commondb[i], commonext[i])
syncResult.Update()
}
if !hasCreating && commonext[i].GetStatus() == api.SNAPSHOT_CREATING {
hasCreating = true
}
}
for i := 0; i < len(added); i += 1 {
local, err := SnapshotManager.newFromCloudSnapshot(ctx, userCred, added[i], region, syncOwnerId, provider)
@@ -2626,8 +2633,11 @@ func (self *SDisk) syncSnapshots(ctx context.Context, userCred mcclient.TokenCre
syncMetadata(ctx, userCred, local, added[i])
syncResult.Add()
}
if !hasCreating && added[i].GetStatus() == api.SNAPSHOT_CREATING {
hasCreating = true
}
}
return syncResult
return
}
func (self *SDisk) GetSnapshotsNotInInstanceSnapshot() ([]SSnapshot, error) {