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: add lb quota check

Browse Source
This commit is contained in:
Qu Xuan
2020-10-21 21:18:29 +08:00
parent 4e1e4e29fd
commit 5e4cc33146
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/loadbalancers.go
+16 -1
View File
@@ -310,8 +310,9 @@ func (man *SLoadbalancerManager) ValidateCreateData(
input.CloudregionId = region.GetId()
var cloudprovider *SCloudprovider
if len(input.CloudproviderId) > 0 {
_, input.CloudproviderResourceInput, err = ValidateCloudproviderResourceInput(userCred, input.CloudproviderResourceInput)
cloudprovider, input.CloudproviderResourceInput, err = ValidateCloudproviderResourceInput(userCred, input.CloudproviderResourceInput)
if err != nil {
return nil, errors.Wrap(err, "ValidateCloudproviderResourceInput")
}
@@ -322,6 +323,13 @@ func (man *SLoadbalancerManager) ValidateCreateData(
return nil, err
}
quotaKeys := fetchRegionalQuotaKeys(rbacutils.ScopeProject, ownerId, region, cloudprovider)
pendingUsage := SRegionQuota{Loadbalancer: 1}
pendingUsage.SetKeys(quotaKeys)
if err := quotas.CheckSetPendingQuota(ctx, userCred, &pendingUsage); err != nil {
return nil, httperrors.NewOutOfQuotaError("%s", err)
}
return region.GetDriver().ValidateCreateLoadbalancerData(ctx, userCred, ownerId, input.JSON(input))
}
@@ -371,6 +379,13 @@ func (lb *SLoadbalancer) PostCreate(ctx context.Context, userCred mcclient.Token
// NOTE this means lb.UpdateVersion will be 0, then 1 after creation
// NOTE need ways to notify error
pendingUsage := SRegionQuota{Loadbalancer: 1}
pendingUsage.SetKeys(lb.GetQuotaKeys())
err := quotas.CancelPendingUsage(ctx, userCred, &pendingUsage, &pendingUsage, true)
if err != nil {
log.Errorf("CancelPendingUsage error %s", err)
}
lb.SetStatus(userCred, api.LB_CREATING, "")
if err := lb.StartLoadBalancerCreateTask(ctx, userCred, data.(*jsonutils.JSONDict), ""); err != nil {
log.Errorf("Failed to create loadbalancer error: %v", err)