From 157fb1e488744cfa343b153eee0613592628aff1 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Fri, 13 Nov 2020 23:55:33 +0800 Subject: [PATCH] fix: host memory usage status not correct --- pkg/compute/models/hosts.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index 9d10463c49..370ed1f714 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -2516,10 +2516,10 @@ func (manager *SHostManager) totalCountQ( isolatedDevices := IsolatedDeviceManager.Query().SubQuery() iq := isolatedDevices.Query( isolatedDevices.Field("host_id"), - isolatedDevices.Field("reserved_memory", "isolated_reserved_memory"), - isolatedDevices.Field("reserved_cpu", "isolated_reserved_cpu"), - isolatedDevices.Field("reserved_storage", "isolated_reserved_storage"), - ).IsNullOrEmpty("guest_id").SubQuery() + sqlchemy.SUM("isolated_reserved_memory", isolatedDevices.Field("reserved_memory")), + sqlchemy.SUM("isolated_reserved_cpu", isolatedDevices.Field("reserved_cpu")), + sqlchemy.SUM("isolated_reserved_storage", isolatedDevices.Field("reserved_storage")), + ).IsNullOrEmpty("guest_id").GroupBy(isolatedDevices.Field("host_id")).SubQuery() q = q.LeftJoin(iq, sqlchemy.Equals(q.Field("id"), iq.Field("host_id"))) q.AppendField( iq.Field("isolated_reserved_memory"), @@ -2527,6 +2527,7 @@ func (manager *SHostManager) totalCountQ( iq.Field("isolated_reserved_storage"), ) q = AttachUsageQuery(q, hosts, hostTypes, resourceTypes, providers, brands, cloudEnv, rangeObjs) + log.Debugf("hostCount: %s", q.String()) return q }