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

Merge pull request #8643 from swordqiu/hotfix/qj-elasticcache-quota

Browse Source 
fix: elasticcache quota not take effect
This commit is contained in:
yunion-ci-robot
2020-11-04 10:54:46 +08:00
committed by GitHub
parent 6269097b3b 9f122f7452
commit acff2f6a09
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/dbinstances.go
+1 -1
View File
@@ -448,7 +448,7 @@ func (man *SDBInstanceManager) ValidateCreateData(ctx context.Context, userCred
func (self *SDBInstance) PostCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) {
self.SVirtualResourceBase.PostCreate(ctx, userCred, ownerId, query, data)
pendingUsage := SRegionQuota{Loadbalancer: 1}
pendingUsage := SRegionQuota{Rds: 1}
pendingUsage.SetKeys(self.GetQuotaKeys())
err := quotas.CancelPendingUsage(ctx, userCred, &pendingUsage, &pendingUsage, true)
if err != nil {
pkg/compute/models/elasticcache_instances.go
+23 -1
View File
@@ -711,12 +711,15 @@ func (manager *SElasticcacheManager) ValidateCreateData(ctx context.Context, use
func (manager *SElasticcacheManager) validateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
var region *SCloudregion
var provider *SCloudprovider
if id, _ := data.GetString("network"); len(id) > 0 {
network, err := db.FetchByIdOrName(NetworkManager, userCred, strings.Split(id, ",")[0])
if err != nil {
return nil, fmt.Errorf("getting network failed")
}
region = network.(*SNetwork).GetRegion()
vpc := network.(*SNetwork).GetVpc()
provider = vpc.GetCloudprovider()
}
if region == nil {
@@ -751,12 +754,31 @@ func (manager *SElasticcacheManager) validateCreateData(ctx context.Context, use
}
data.Update(jsonutils.Marshal(input))
return region.GetDriver().ValidateCreateElasticcacheData(ctx, userCred, nil, data)
ret, err := region.GetDriver().ValidateCreateElasticcacheData(ctx, userCred, nil, data)
if err != nil {
return nil, errors.Wrap(err, "region.GetDriver().ValidateCreateElasticcacheData")
}
cachePendingUsage := &SRegionQuota{Cache: 1}
quotaKeys := fetchRegionalQuotaKeys(rbacutils.ScopeProject, ownerId, region, provider)
cachePendingUsage.SetKeys(quotaKeys)
if err = quotas.CheckSetPendingQuota(ctx, userCred, cachePendingUsage); err != nil {
return nil, errors.Wrap(err, "quotas.CheckSetPendingQuota")
}
return ret, nil
}
func (self *SElasticcache) PostCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) {
self.SVirtualResourceBase.PostCreate(ctx, userCred, ownerId, query, data)
pendingUsage := SRegionQuota{Cache: 1}
pendingUsage.SetKeys(self.GetQuotaKeys())
err := quotas.CancelPendingUsage(ctx, userCred, &pendingUsage, &pendingUsage, true)
if err != nil {
log.Errorf("CancelPendingUsage error %s", err)
}
password, _ := data.GetString("password")
if reset, _ := data.Bool("reset_password"); reset && len(password) == 0 {
password = seclib2.RandomPassword2(12)