lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-07-01 06:14:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): host order by virt cpu (#23457)

Browse Source
This commit is contained in:
屈轩
2025-09-30 13:19:16 +08:00
committed by GitHub
parent e504d0d4e3
commit ebdcabe330
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/compute/models/hosts.go
View File

@@ -819,7 +819,7 @@ func (manager *SHostManager) OrderByExtraFields(
sqlchemy.NewCase().When(
sqlchemy.GT(host.Field("mem_cmtbound"), 0),
host.Field("mem_cmtbound"),
).Else(sqlchemy.NewConstField(1)),
).Else(sqlchemy.NewConstField(options.Options.DefaultMemoryOvercommitBound)),
"mem_cmtbound",
true,
),
@@ -828,7 +828,7 @@ func (manager *SHostManager) OrderByExtraFields(
vsq := vq.Query(
vq.Field("host_id"),
sqlchemy.MUL("virtual_mem_usage", vq.Field("mem_commit"), sqlchemy.DIV("cmt_mem_size", vq.Field("mem_cmtbound"), vq.Field("host_mem_size"))),
sqlchemy.DIV("virtual_mem_usage", vq.Field("mem_commit"), sqlchemy.DIV("cmt_mem_size", vq.Field("mem_cmtbound"), vq.Field("host_mem_size"))),
)
vqq := vsq.GroupBy(vsq.Field("host_id")).SubQuery()
@@ -859,7 +859,7 @@ func (manager *SHostManager) OrderByExtraFields(
sqlchemy.NewCase().When(
sqlchemy.GT(host.Field("cpu_cmtbound"), 0),
host.Field("cpu_cmtbound"),
).Else(sqlchemy.NewConstField(1)),
).Else(sqlchemy.NewConstField(options.Options.DefaultCPUOvercommitBound)),
"cpu_cmtbound",
true,
),
@@ -868,7 +868,7 @@ func (manager *SHostManager) OrderByExtraFields(
vsq := vq.Query(
vq.Field("host_id"),
sqlchemy.MUL("virtual_cpu_usage", vq.Field("cpu_commit"), sqlchemy.DIV("cmt_cpu_size", vq.Field("cpu_cmtbound"), vq.Field("host_cpu_size"))),
sqlchemy.DIV("virtual_cpu_usage", vq.Field("cpu_commit"), sqlchemy.DIV("cmt_cpu_size", vq.Field("cpu_cmtbound"), vq.Field("host_cpu_size"))),
)
vqq := vsq.GroupBy(vsq.Field("host_id")).SubQuery()