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

fix: pending usage not release after failed change config

Browse Source
This commit is contained in:
Qiu Jian
2019-08-23 22:42:32 +08:00
parent 87e37f2497
commit aa24ef2b88
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/disk_base_task.go
+4 -6
View File
@@ -39,12 +39,10 @@ func (self *SDiskBaseTask) SetStageFailed(ctx context.Context, reason string) {
func (self *SDiskBaseTask) finalReleasePendingUsage(ctx context.Context) {
pendingUsage := models.SQuota{}
err := self.GetPendingUsage(&pendingUsage)
if err == nil {
if !pendingUsage.IsEmpty() {
disk := self.getDisk()
quotaPlatform := disk.GetQuotaPlatformID()
models.QuotaManager.CancelPendingUsage(ctx, self.UserCred, rbacutils.ScopeProject, disk.GetOwnerId(), quotaPlatform, &pendingUsage, &pendingUsage)
}
if err == nil && !pendingUsage.IsEmpty() {
disk := self.getDisk()
quotaPlatform := disk.GetQuotaPlatformID()
models.QuotaManager.CancelPendingUsage(ctx, self.UserCred, rbacutils.ScopeProject, disk.GetOwnerId(), quotaPlatform, &pendingUsage, &pendingUsage)
}
}
pkg/compute/tasks/guest_base_task.go
+4 -6
View File
@@ -39,11 +39,9 @@ func (self *SGuestBaseTask) SetStageFailed(ctx context.Context, reason string) {
func (self *SGuestBaseTask) finalReleasePendingUsage(ctx context.Context) {
pendingUsage := models.SQuota{}
err := self.GetPendingUsage(&pendingUsage)
if err != nil {
if !pendingUsage.IsEmpty() {
guest := self.getGuest()
quotaPlatform := guest.GetQuotaPlatformID()
models.QuotaManager.CancelPendingUsage(ctx, self.UserCred, rbacutils.ScopeProject, guest.GetOwnerId(), quotaPlatform, &pendingUsage, &pendingUsage)
}
if err == nil && !pendingUsage.IsEmpty() {
guest := self.getGuest()
quotaPlatform := guest.GetQuotaPlatformID()
models.QuotaManager.CancelPendingUsage(ctx, self.UserCred, rbacutils.ScopeProject, guest.GetOwnerId(), quotaPlatform, &pendingUsage, &pendingUsage)
}
}