555

ymakedaq · Sep 29, 2024 · e37390f · e37390f
1 parent b0f70c4
commit e37390f
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 1 deletion.
diff --git a/...urce/internal/controller/manage/import.go → ...e/internal/controller/manage/rs_import.go b/...urce/internal/controller/manage/import.go → ...e/internal/controller/manage/rs_import.go
diff --git a/...source/internal/controller/manage/list.go → ...rce/internal/controller/manage/rs_list.go b/...source/internal/controller/manage/list.go → ...rce/internal/controller/manage/rs_list.go
diff --git a/...urce/internal/controller/manage/manage.go → ...e/internal/controller/manage/rs_manage.go b/...urce/internal/controller/manage/manage.go → ...e/internal/controller/manage/rs_manage.go
diff --git a/...source/internal/controller/manage/spec.go → ...rce/internal/controller/manage/rs_spec.go b/...source/internal/controller/manage/spec.go → ...rce/internal/controller/manage/rs_spec.go
diff --git a/dbm-services/common/db-resource/internal/model/TbRpDetail.go b/dbm-services/common/db-resource/internal/model/TbRpDetail.go
@@ -133,7 +133,7 @@ func (t TbRpDetail) MatchDbmSpec(spec dbmapi.DbmSpec) bool {
 			logger.Warn("cpu not match, dbmSpec:%+v, detail:%s", spec.SpecName, t.IP)
 			return false
 		}
-		if !isWithinRange(t.DramCap, spec.Mem.Min*1000, spec.Mem.Max*1000) {
+		if !isWithinRange(t.DramCap, int(spec.Mem.Min*1024-int(0.5*1024)), spec.Mem.Max*1024) {
 			logger.Warn("mem not match, dbmSpec:%+v, detail:%s", spec.SpecName, t.IP)
 			return false
 		}