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] fix bug

Browse Source
This commit is contained in:
zhoujunhao 2018-08-22 16:28:56 +08:00
parent bff2e520e7
commit cb9e79c847
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grctl/cmd/cluster.go
View File

@ -77,7 +77,7 @@ func getClusterInfo(c *cli.Context) error {
serviceTable.AddHeaders("Uid", "IP", "HostName", "NodeRole", "NodeMode", "Status", "UsedCPU", "UseMemory")
var rest []*client.HostNode
for _, v := range list {
if v.Role.HasRule("manage") {
if v.Role.HasRule("manage") || !v.Role.HasRule("compute") {
handleStatus(serviceTable, isNodeReady(v), v, 0, 0)
} else {
rest = append(rest, v)

15
grctl/cmd/node.go
View File

@ -245,7 +245,7 @@ func NewCmdNode() cli.Command {
serviceTable.AddHeaders("Uid", "IP", "HostName", "NodeRole", "NodeMode", "Status", "UsedCPU", "UseMemory")
var rest []*client.HostNode
for _, v := range list {
if v.Role.HasRule("manage") {
if v.Role.HasRule("manage") || !v.Role.HasRule("compute") {
handleStatus(serviceTable, isNodeReady(v), v, 0, 0)
} else {
rest = append(rest, v)
@ -365,9 +365,18 @@ func NewCmdNode() cli.Command {
hostnodes, err := clients.RegionClient.Nodes().GetNodeByRule(rule)
handleErr(err)
serviceTable := termtables.CreateTable()
serviceTable.AddHeaders("Uid", "IP", "HostName", "NodeRole", "NodeMode", "Status", "Alived", "Schedulable", "Ready")
serviceTable.AddHeaders("Uid", "IP", "HostName", "NodeRole", "NodeMode", "Status", "UsedCPU", "UseMemory")
for _, v := range hostnodes {
handleStatus(serviceTable, isNodeReady(v), v)
if v.Role.HasRule("compute") {
nodeResource, err := clients.RegionClient.Nodes().GetNodeResource(v.ID)
handleErr(err)
usedCpu := nodeResource.ReqCPU / float32(nodeResource.CapCPU) * 100
useMemory := nodeResource.ReqMem / nodeResource.CapMem * 100
handleStatus(serviceTable, isNodeReady(v), v, usedCpu, useMemory)
} else if v.Role.HasRule("manage") {
handleStatus(serviceTable, isNodeReady(v), v, 0, 0)
}
}
return nil
},