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

Merge pull request #491 from swordqiu/hotfix/qj-server-update-validate-skip-quota-check-if-cpu-mem-not-set

Browse Source 
fix: skip quota check in server validateupdatedata if cpu and mem not updated
This commit is contained in:
yunion-ci-robot
2019-04-19 16:52:12 +08:00
committed by GitHub
parent eac3871ad0 a04be21c61
commit da8e2ce6b1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+5 -3
View File
@@ -798,9 +798,11 @@ func (self *SGuest) ValidateUpdateData(ctx context.Context, userCred mcclient.To
return nil, err
}
err = self.checkUpdateQuota(ctx, userCred, vcpuCount, vmemSize)
if err != nil {
return nil, httperrors.NewOutOfQuotaError(err.Error())
if vcpuCount > 0 || vmemSize > 0 {
err = self.checkUpdateQuota(ctx, userCred, vcpuCount, vmemSize)
if err != nil {
return nil, httperrors.NewOutOfQuotaError(err.Error())
}
}
if data.Contains("name") {