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(region): hugepage validate mem update

Browse Source
This commit is contained in:
wanyaoqi
2022-10-14 10:15:20 +08:00
parent 7c9e7aaa85
commit b2e1c0b2d9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+6 -3
View File
@@ -710,7 +710,10 @@ func (self *SHost) IsHugePage() bool {
}
func (self *SHost) GetMemoryOvercommitBound() float32 {
if self.MemCmtbound > 0 && self.IsHugePage() {
if self.IsHugePage() {
return 1.0
}
if self.MemCmtbound > 0 {
return self.MemCmtbound
}
return options.Options.DefaultMemoryOvercommitBound
@@ -3654,8 +3657,8 @@ func (self *SHost) ValidateUpdateData(ctx context.Context, userCred mcclient.Tok
return input, errors.Wrap(err, "inputUniquenessCheck")
}
if self.IsHugePage() && (input.MemReserved != "" || input.MemCmtbound != nil) {
return input, errors.Errorf("host mem is hugepage, cannot update mem_reserved or mem_cmtbound")
if self.IsHugePage() && input.MemCmtbound != nil {
return input, errors.Errorf("host mem is hugepage, cannot update mem_cmtbound")
}
input.HostSizeAttributes, err = HostManager.ValidateSizeParams(input.HostSizeAttributes)