From dce7646d5580f6dba97ed7830d8a3355cef9d8c4 Mon Sep 17 00:00:00 2001 From: TangBin Date: Fri, 14 Dec 2018 14:45:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BE=8Bmem=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E9=83=A8=E5=88=86mem=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/skus.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/skus.go b/pkg/compute/models/skus.go index dc0e525079..502de85080 100644 --- a/pkg/compute/models/skus.go +++ b/pkg/compute/models/skus.go @@ -286,7 +286,8 @@ func (self *SServerSkuManager) GetPropertyInstanceSpecs(ctx context.Context, use mems_mb := jsonutils.NewArray() cpu_mems_mb := map[string][]int{} - oc, om := 0, 0 + mems := map[int]bool{} + oc := 0 for i := range skus { nc := skus[i].CpuCoreCount nm := skus[i].MemorySizeMB @@ -296,9 +297,9 @@ func (self *SServerSkuManager) GetPropertyInstanceSpecs(ctx context.Context, use oc = nc } - if nm > om { + if _, exists := mems[nm]; !exists { mems_mb.Add(jsonutils.NewInt(int64(nm))) - om = nm + mems[nm] = true } k := strconv.Itoa(nc)