test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-30 10:48:15 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[FIX] wrong used memory

Browse Source
This commit is contained in:
GLYASAI 2019-01-25 22:05:38 +08:00
parent dc081e9662
commit 4af443d482
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/handler/cloud/chargesverify.go
View File

@ -90,7 +90,7 @@ func PriChargeSverify(tenant *model.Tenants, quantity int) *util.APIHandleError
for k, v := range ss {
if !handler.GetTenantManager().IsClosedStatus(v) {
if svc, ok := svcMap[k]; ok {
usedMem += svc.ContainerMemory
usedMem += svc.ContainerMemory * svc.Replicas
}
}
}
@ -119,13 +119,17 @@ func PriChargeSverify(tenant *model.Tenants, quantity int) *util.APIHandleError
for _, item := range tenants {
availMem = availMem - int64(item.LimitMemory)
}
if availMem >= int64(quantity) {
return util.CreateAPIHandleError(200, fmt.Errorf("success"))
} else {
return util.CreateAPIHandleError(200, fmt.Errorf("cluster_lack_of_memory"))
}
} else {
availMem = availMem - int64(usedMem)
}
if availMem >= int64(quantity) {
return util.CreateAPIHandleError(200, fmt.Errorf("success"))
} else {
return util.CreateAPIHandleError(200, fmt.Errorf("lack_of_memory"))
if availMem >= int64(quantity) {
return util.CreateAPIHandleError(200, fmt.Errorf("success"))
} else {
return util.CreateAPIHandleError(200, fmt.Errorf("lack_of_memory"))
}
}
}