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 #8392 from rainzm/fix/snapshotpolicy2

Browse Source 
Fix of snapshotpolicy
This commit is contained in:
Zexi Li
2020-10-20 11:49:24 +08:00
committed by GitHub
parent 2bc39203ea f6844e3c6d
commit 95bba5df0b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/caller.go
+3 -2
View File
@@ -301,8 +301,9 @@ func FetchCustomizeColumns(
retVal := make([]*jsonutils.JSONDict, ret[0].Len())
for i := 0; i < ret[0].Len(); i += 1 {
jsonDict := ValueToJSONDict(ret[0].Index(i))
jsonDict.Update(jsonutils.Marshal(objs[i]).(*jsonutils.JSONDict))
retVal[i] = jsonDict
objDict := jsonutils.Marshal(objs[i]).(*jsonutils.JSONDict)
objDict.Update(jsonDict)
retVal[i] = objDict
}
return retVal, nil
}
pkg/compute/models/snapshotpolicy.go
+3 -3
View File
@@ -310,11 +310,11 @@ func (sp *SSnapshotPolicy) DetachAfterDelete(ctx context.Context, userCred mccli
func (sp *SSnapshotPolicy) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
// check if sp bind to some disks
sds, err := SnapshotPolicyDiskManager.FetchAllBySnapshotpolicyID(ctx, userCred, sp.GetId())
count, err := SnapshotPolicyDiskManager.FetchDiskCountBySPID(sp.Id)
if err != nil {
return errors.Wrap(err, "fetch bind info failed")
return errors.Wrap(err, "unable to FetchDiskCountBySPID")
}
if len(sds) != 0 {
if count != 0 {
return httperrors.NewBadRequestError("Couldn't delete snapshot policy binding to disks")
}
sp.SetStatus(userCred, api.SNAPSHOT_POLICY_DELETING, "")