fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2539 from swordqiu/hotfix/qj-not-release-pending-usage-after-failed-change-config

Browse Source 
fix: pending usage not release after failed change config
This commit is contained in:
yunion-ci-robot
2019-08-24 18:40:10 +08:00
committed by GitHub
parent 0c012aed17 aa24ef2b88
commit 5eba4a3f4d
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/compute/tasks/disk_base_task.go
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)
}
}

10
pkg/compute/tasks/guest_base_task.go
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)
}
}