opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4139 from swordqiu/hotfix/qj-unlimit-negative-quota

Browse Source 
fix: init quota with negative value and negative quota means unlimited
This commit is contained in:
yunion-ci-robot
2019-12-13 14:44:05 +08:00
committed by GitHub
parent 2d50da9e40 c8a07c87ad
commit 432bcaaf1b
6 changed files with 72 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/quotas/utils.go
+7
View File
@@ -31,3 +31,10 @@ func KeyName(prefix, name string) string {
return name
}
}
func Exceed(used, request, quota int) bool {
if quota >= 0 && request > 0 && used+request > quota {
return true
}
return false
}
pkg/compute/models/projectquota.go
+4 -4
View File
@@ -68,7 +68,7 @@ type SProjectQuota struct {
quotas.SBaseQuotaKeys
Secgroup int
Secgroup int `default:"-1"`
}
func (self *SProjectQuota) GetKeys() quotas.IQuotaKeys {
@@ -142,12 +142,12 @@ func (self *SProjectQuota) Update(quota quotas.IQuota) {
}
}
func (self *SProjectQuota) Exceed(request quotas.IQuota, quota quotas.IQuota) error {
func (used *SProjectQuota) Exceed(request quotas.IQuota, quota quotas.IQuota) error {
err := quotas.NewOutOfQuotaError()
sreq := request.(*SProjectQuota)
squota := quota.(*SProjectQuota)
if sreq.Secgroup > 0 && self.Secgroup+sreq.Secgroup > squota.Secgroup {
err.Add("secgroup", squota.Secgroup, self.Secgroup, sreq.Secgroup)
if quotas.Exceed(used.Secgroup, sreq.Secgroup, squota.Secgroup) {
err.Add("secgroup", squota.Secgroup, used.Secgroup, sreq.Secgroup)
}
if err.IsError() {
return err
pkg/compute/models/quotas.go
+19 -24
View File
@@ -20,7 +20,6 @@ import (
"fmt"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/tristate"
@@ -81,13 +80,13 @@ type SQuota struct {
SComputeResourceKeys
Count int
Cpu int
Memory int
Storage int
Count int `default:"-1"`
Cpu int `default:"-1"`
Memory int `default:"-1"`
Storage int `default:"-1"`
Group int
IsolatedDevice int
Group int `default:"-1"`
IsolatedDevice int `default:"-1"`
}
func (self *SQuota) GetKeys() quotas.IQuotaKeys {
@@ -260,31 +259,27 @@ func (self *SQuota) Update(quota quotas.IQuota) {
}
}
func (self *SQuota) Exceed(request quotas.IQuota, quota quotas.IQuota) error {
log.Debugf("used: %s", jsonutils.Marshal(self))
log.Debugf("request: %s", jsonutils.Marshal(request))
log.Debugf("quota: %s", jsonutils.Marshal(quota))
func (used *SQuota) Exceed(request quotas.IQuota, quota quotas.IQuota) error {
err := quotas.NewOutOfQuotaError()
sreq := request.(*SQuota)
squota := quota.(*SQuota)
if sreq.Count > 0 && self.Count+sreq.Count > squota.Count {
err.Add("count", squota.Count, self.Count, sreq.Count)
if quotas.Exceed(used.Count, sreq.Count, squota.Count) {
err.Add("count", squota.Count, used.Count, sreq.Count)
}
if sreq.Cpu > 0 && self.Cpu+sreq.Cpu > squota.Cpu {
err.Add("cpu", squota.Cpu, self.Cpu, sreq.Cpu)
if quotas.Exceed(used.Cpu, sreq.Cpu, squota.Cpu) {
err.Add("cpu", squota.Cpu, used.Cpu, sreq.Cpu)
}
if sreq.Memory > 0 && self.Memory+sreq.Memory > squota.Memory {
err.Add("memory", squota.Memory, self.Memory, sreq.Memory)
if quotas.Exceed(used.Memory, sreq.Memory, squota.Memory) {
err.Add("memory", squota.Memory, used.Memory, sreq.Memory)
}
if sreq.Storage > 0 && self.Storage+sreq.Storage > squota.Storage {
err.Add("storage", squota.Storage, self.Storage, sreq.Storage)
if quotas.Exceed(used.Storage, sreq.Storage, squota.Storage) {
err.Add("storage", squota.Storage, used.Storage, sreq.Storage)
}
if sreq.Group > 0 && self.Group+sreq.Group > squota.Group {
err.Add("group", squota.Group, self.Group, sreq.Group)
if quotas.Exceed(used.Group, sreq.Group, squota.Group) {
err.Add("group", squota.Group, used.Group, sreq.Group)
}
if sreq.IsolatedDevice > 0 && self.IsolatedDevice+sreq.IsolatedDevice > squota.IsolatedDevice {
err.Add("isolated_device", squota.IsolatedDevice, self.IsolatedDevice, sreq.IsolatedDevice)
if quotas.Exceed(used.IsolatedDevice, sreq.IsolatedDevice, squota.IsolatedDevice) {
err.Add("isolated_device", squota.IsolatedDevice, used.IsolatedDevice, sreq.IsolatedDevice)
}
if err.IsError() {
return err
pkg/compute/models/regionquota.go
+34 -34
View File
@@ -70,20 +70,20 @@ type SRegionQuota struct {
quotas.SRegionalCloudResourceKeys
Eip int
Port int
Eport int
Bw int
Ebw int
Eip int `default:"-1"`
Port int `default:"-1"`
Eport int `default:"-1"`
Bw int `default:"-1"`
Ebw int `default:"-1"`
Snapshot int
Snapshot int `default:"-1"`
Bucket int
ObjectGB int
ObjectCnt int
Bucket int `default:"-1"`
ObjectGB int `default:"-1"`
ObjectCnt int `default:"-1"`
Rds int
Cache int
Rds int `default:"-1"`
Cache int `default:"-1"`
}
func (self *SRegionQuota) GetKeys() quotas.IQuotaKeys {
@@ -300,42 +300,42 @@ func (self *SRegionQuota) Update(quota quotas.IQuota) {
}
}
func (self *SRegionQuota) Exceed(request quotas.IQuota, quota quotas.IQuota) error {
func (used *SRegionQuota) Exceed(request quotas.IQuota, quota quotas.IQuota) error {
err := quotas.NewOutOfQuotaError()
sreq := request.(*SRegionQuota)
squota := quota.(*SRegionQuota)
if sreq.Port > 0 && self.Port+sreq.Port > squota.Port {
err.Add("port", squota.Port, self.Port, sreq.Port)
if quotas.Exceed(used.Port, sreq.Port, squota.Port) {
err.Add("port", squota.Port, used.Port, sreq.Port)
}
if sreq.Eip > 0 && self.Eip+sreq.Eip > squota.Eip {
err.Add("eip", squota.Eip, self.Eip, sreq.Eip)
if quotas.Exceed(used.Eip, sreq.Eip, squota.Eip) {
err.Add("eip", squota.Eip, used.Eip, sreq.Eip)
}
if sreq.Eport > 0 && self.Eport+sreq.Eport > squota.Eport {
err.Add("eport", squota.Eport, self.Eport, sreq.Eport)
if quotas.Exceed(used.Eport, sreq.Eport, squota.Eport) {
err.Add("eport", squota.Eport, used.Eport, sreq.Eport)
}
if sreq.Bw > 0 && self.Bw+sreq.Bw > squota.Bw {
err.Add("bw", squota.Bw, self.Bw, sreq.Bw)
if quotas.Exceed(used.Bw, sreq.Bw, squota.Bw) {
err.Add("bw", squota.Bw, used.Bw, sreq.Bw)
}
if sreq.Ebw > 0 && self.Ebw+sreq.Ebw > squota.Ebw {
err.Add("ebw", squota.Ebw, self.Ebw, sreq.Ebw)
if quotas.Exceed(used.Bw, sreq.Ebw, squota.Ebw) {
err.Add("ebw", squota.Ebw, used.Ebw, sreq.Ebw)
}
if sreq.Snapshot > 0 && self.Snapshot+sreq.Snapshot > squota.Snapshot {
err.Add("snapshot", squota.Snapshot, self.Snapshot, sreq.Snapshot)
if quotas.Exceed(used.Snapshot, sreq.Snapshot, squota.Snapshot) {
err.Add("snapshot", squota.Snapshot, used.Snapshot, sreq.Snapshot)
}
if sreq.Bucket > 0 && self.Bucket+sreq.Bucket > squota.Bucket {
err.Add("bucket", squota.Bucket, self.Bucket, sreq.Bucket)
if quotas.Exceed(used.Bucket, sreq.Bucket, squota.Bucket) {
err.Add("bucket", squota.Bucket, used.Bucket, sreq.Bucket)
}
if sreq.ObjectGB > 0 && self.ObjectGB+sreq.ObjectGB > squota.ObjectGB {
err.Add("object_gb", squota.ObjectGB, self.ObjectGB, sreq.ObjectGB)
if quotas.Exceed(used.ObjectGB, sreq.ObjectGB, squota.ObjectGB) {
err.Add("object_gb", squota.ObjectGB, used.ObjectGB, sreq.ObjectGB)
}
if sreq.ObjectCnt > 0 && self.ObjectCnt+sreq.ObjectCnt > squota.ObjectCnt {
err.Add("object_cnt", squota.ObjectCnt, self.ObjectCnt, sreq.ObjectCnt)
if quotas.Exceed(used.ObjectCnt, sreq.ObjectCnt, squota.ObjectCnt) {
err.Add("object_cnt", squota.ObjectCnt, used.ObjectCnt, sreq.ObjectCnt)
}
if sreq.Rds > 0 && self.Rds+sreq.Rds > squota.Rds {
err.Add("rds", squota.Rds, self.Rds, sreq.Rds)
if quotas.Exceed(used.Rds, sreq.Rds, squota.Rds) {
err.Add("rds", squota.Rds, used.Rds, sreq.Rds)
}
if sreq.Cache > 0 && self.Cache+sreq.Cache > squota.Cache {
err.Add("cache", squota.Cache, self.Cache, sreq.Cache)
if quotas.Exceed(used.Cache, sreq.Cache, squota.Cache) {
err.Add("cache", squota.Cache, used.Cache, sreq.Cache)
}
if err.IsError() {
return err
pkg/compute/models/zonequota.go
+4 -4
View File
@@ -70,7 +70,7 @@ type SZoneQuota struct {
quotas.SZonalCloudResourceKeys
Loadbalancer int
Loadbalancer int `default:"-1"`
}
func (self *SZoneQuota) GetKeys() quotas.IQuotaKeys {
@@ -182,12 +182,12 @@ func (self *SZoneQuota) Update(quota quotas.IQuota) {
}
}
func (self *SZoneQuota) Exceed(request quotas.IQuota, quota quotas.IQuota) error {
func (used *SZoneQuota) Exceed(request quotas.IQuota, quota quotas.IQuota) error {
err := quotas.NewOutOfQuotaError()
sreq := request.(*SZoneQuota)
squota := quota.(*SZoneQuota)
if sreq.Loadbalancer > 0 && self.Loadbalancer+sreq.Loadbalancer > squota.Loadbalancer {
err.Add("loadbalancer", squota.Loadbalancer, self.Loadbalancer, sreq.Loadbalancer)
if quotas.Exceed(used.Loadbalancer, sreq.Loadbalancer, squota.Loadbalancer) {
err.Add("loadbalancer", squota.Loadbalancer, used.Loadbalancer, sreq.Loadbalancer)
}
if err.IsError() {
return err
pkg/image/models/quotas.go
+4 -4
View File
@@ -72,7 +72,7 @@ type SQuota struct {
SImageQuotaKeys
Image int
Image int `default:"-1"`
}
func (self *SQuota) GetKeys() quotas.IQuotaKeys {
@@ -156,12 +156,12 @@ func (self *SQuota) Update(quota quotas.IQuota) {
}
}
func (self *SQuota) Exceed(request quotas.IQuota, quota quotas.IQuota) error {
func (used *SQuota) Exceed(request quotas.IQuota, quota quotas.IQuota) error {
err := quotas.NewOutOfQuotaError()
sreq := request.(*SQuota)
squota := quota.(*SQuota)
if sreq.Image > 0 && self.Image+sreq.Image > squota.Image {
err.Add("image", squota.Image, self.Image, sreq.Image)
if quotas.Exceed(used.Image, sreq.Image, squota.Image) {
err.Add("image", squota.Image, used.Image, sreq.Image)
}
if err.IsError() {
return err