opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: server change config failed due to quota recode

Browse Source
This commit is contained in:
Qiu Jian
2019-12-16 21:03:52 +08:00
parent db2b599dcd
commit bdfa99b0b6
6 changed files with 75 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/guest_change_config_task.go
+22 -10
View File
@@ -199,10 +199,10 @@ func (self *GuestChangeConfigTask) OnGuestChangeCpuMemSpecComplete(ctx context.C
return
}
changeConfigSpec := jsonutils.NewDict()
if addCpu > 0 {
if addCpu != 0 {
changeConfigSpec.Set("add_cpu", jsonutils.NewInt(int64(addCpu)))
}
if addMem > 0 {
if addMem != 0 {
changeConfigSpec.Set("add_mem", jsonutils.NewInt(int64(addMem)))
}
if len(instanceType) > 0 {
@@ -218,11 +218,16 @@ func (self *GuestChangeConfigTask) OnGuestChangeCpuMemSpecComplete(ctx context.C
return
}
var cancelUsage models.SQuota
var reduceUsage models.SQuota
if addCpu > 0 {
cancelUsage.Cpu = addCpu
} else if addCpu < 0 {
reduceUsage.Cpu = -addCpu
}
if addMem > 0 {
cancelUsage.Memory = addMem
} else if addMem < 0 {
reduceUsage.Memory = -addMem
}
keys, err := guest.GetQuotaKeys()
@@ -231,19 +236,26 @@ func (self *GuestChangeConfigTask) OnGuestChangeCpuMemSpecComplete(ctx context.C
return
}
cancelUsage.SetKeys(keys)
reduceUsage.SetKeys(keys)
lockman.LockClass(ctx, guest.GetModelManager(), guest.ProjectId)
defer lockman.ReleaseClass(ctx, guest.GetModelManager(), guest.ProjectId)
err = quotas.CancelPendingUsage(ctx, self.UserCred, &pendingUsage, &cancelUsage)
if err != nil {
self.markStageFailed(ctx, guest, fmt.Sprintf("CancelPendingUsage fail %s", err))
return
if !cancelUsage.IsEmpty() {
err = quotas.CancelPendingUsage(ctx, self.UserCred, &pendingUsage, &cancelUsage)
if err != nil {
self.markStageFailed(ctx, guest, fmt.Sprintf("CancelPendingUsage fail %s", err))
return
}
err = self.SetPendingUsage(&pendingUsage, 0)
if err != nil {
self.markStageFailed(ctx, guest, fmt.Sprintf("SetPendingUsage fail %s", err))
return
}
}
err = self.SetPendingUsage(&pendingUsage, 0)
if err != nil {
self.markStageFailed(ctx, guest, fmt.Sprintf("SetPendingUsage fail %s", err))
return
if !reduceUsage.IsEmpty() {
quotas.CancelUsages(ctx, self.UserCred, []db.IUsage{&reduceUsage})
}
self.OnGuestChangeCpuMemSpecFinish(ctx, guest)