test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-04 20:57:38 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into cuib-local-master

Browse Source
This commit is contained in:
pujielan 2018-01-15 14:26:47 +08:00
commit 17d9d1ca1f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/db/mysql/dao/tenants.go
View File

@ -172,13 +172,15 @@ func (t *TenantServicesDaoImpl) GetCPUAndMEM(tenantName []string) ([]map[string]
res["cpu"] = cpu
res["memory"] = mem
res["tenant_id"] = id
res["tenant_name"] = tenantName
dirPath := fmt.Sprintf("/grdata/tenant/%s", id)
cmd := []string{"-sh", dirPath}
cmd := []string{"-sh", "-m", dirPath}
f, err := exec.Command("du", cmd...).Output()
if err != nil {
f = []byte("0 xxx")
f = []byte("1 xxx")
}
st := strings.Split(string(f), "\t")[0]
//TODO: disk默认单位为MB
res["disk"] = st
rc = append(rc, res)
}