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: clean pending usage when dry run validate_create_data (#15823)

Browse Source 
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2023-01-18 23:37:24 +08:00
committed by GitHub
co-authored by Qiu Jian
parent 1ef85f209e
commit 999c30dccb
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/db_dispatcher.go
+14 -5
View File
@@ -1320,20 +1320,22 @@ func (dispatcher *DBModelDispatcher) Create(ctx context.Context, query jsonutils
return nil, errors.Wrap(err, "isClassRbacAllowed")
}
dryRun := jsonutils.QueryBoolean(data, "dry_run", false)
if !dryRun && InitPendingUsagesInContext != nil {
// initialize pending usage in context any way
if InitPendingUsagesInContext != nil {
ctx = InitPendingUsagesInContext(ctx)
}
dryRun := jsonutils.QueryBoolean(data, "dry_run", false)
// inject tag filters imposed by policy
data.(*jsonutils.JSONDict).Update(policyResult.Json())
model, err := DoCreate(manager, ctx, userCred, query, data, ownerId)
if err != nil {
if !dryRun && CancelPendingUsagesInContext != nil {
// validate failed, clean pending usage
if CancelPendingUsagesInContext != nil {
e := CancelPendingUsagesInContext(ctx, userCred)
if e != nil {
err = errors.Wrapf(err, e.Error())
err = errors.Wrapf(err, "CancelPendingUsagesInContext fail %s", e.Error())
}
}
failErr := manager.OnCreateFailed(ctx, userCred, ownerId, query, data)
@@ -1344,6 +1346,13 @@ func (dispatcher *DBModelDispatcher) Create(ctx context.Context, query jsonutils
}
if dryRun {
// dry run, clean pending usage
if CancelPendingUsagesInContext != nil {
err := CancelPendingUsagesInContext(ctx, userCred)
if err != nil {
return nil, errors.Wrap(err, "CancelPendingUsagesInContext")
}
}
return getItemDetails(manager, model, ctx, userCred, query)
}