From 6d1c2ae9f2a002532c53ff036b88c63225b69a2e Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Mon, 25 Nov 2019 21:25:35 +0800 Subject: [PATCH] fix: keystone project resource count not set set to zero --- pkg/cloudcommon/db/project_resources.go | 4 +--- pkg/keystone/cronjobs/project_resources.go | 9 ++++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/cloudcommon/db/project_resources.go b/pkg/cloudcommon/db/project_resources.go index b626a2d6bd..eaac0fd240 100644 --- a/pkg/cloudcommon/db/project_resources.go +++ b/pkg/cloudcommon/db/project_resources.go @@ -52,9 +52,7 @@ func getAllProjectResourceCounts() (map[string][]SProjectResourceCount, error) { if err != nil { return nil, errors.Wrap(err, "getProjectResourceCount") } - if len(resCnt) > 0 { - ret[virtman.KeywordPlural()] = resCnt - } + ret[virtman.KeywordPlural()] = resCnt } } return ret, nil diff --git a/pkg/keystone/cronjobs/project_resources.go b/pkg/keystone/cronjobs/project_resources.go index 8be2cfd0d1..30d493543d 100644 --- a/pkg/keystone/cronjobs/project_resources.go +++ b/pkg/keystone/cronjobs/project_resources.go @@ -139,15 +139,18 @@ func syncProjectResourceCount(regionId string, serviceId string, projResCnt map[ } q := models.ProjectResourceManager.Query() - q = q.NotIn("project_id", projList) + if len(projList) > 0 { + q = q.NotIn("project_id", projList) + } q = q.Equals("region_id", regionId) q = q.Equals("service_id", serviceId) q = q.Equals("resource", res) + q = q.NotEquals("count", 0) emptySets := make([]models.SProjectResource, 0) err := db.FetchModelObjects(models.ProjectResourceManager, q, &emptySets) if err != nil { - log.Errorf("db.FetchModelObjects") + log.Errorf("db.FetchModelObjects %s", err) } for i := range emptySets { @@ -156,7 +159,7 @@ func syncProjectResourceCount(regionId string, serviceId string, projResCnt map[ return nil }) if err != nil { - log.Errorf("db.Update") + log.Errorf("db.Update %s", err) } } }