docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

show container status of each node in docker info 

Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
This commit is contained in:
Sun Hongliang 2016-04-19 21:59:52 +08:00
parent 9a968f5c5d
commit 8a5531777b
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cluster/swarm/cluster.go
View File

@ -865,7 +865,24 @@ func (c *Cluster) Info() [][2]string {
info = append(info, [2]string{" " + engineName, engine.Addr})
info = append(info, [2]string{" └ ID", engine.ID})
info = append(info, [2]string{" └ Status", engine.Status()})
info = append(info, [2]string{" └ Containers", fmt.Sprintf("%d", len(engine.Containers()))})
// if engine's status is healthy, show container details of the node
if engine.IsHealthy() {
var paused, running, stopped int = 0, 0, 0
for _, c := range engine.Containers() {
if c.Info.State.Paused {
paused++
} else if c.Info.State.Running {
running++
} else {
stopped++
}
}
info = append(info, [2]string{" └ Containers", fmt.Sprintf("%d (%d Running, %d Paused, %d Stopped)", len(engine.Containers()), running, paused, stopped)})
} else {
info = append(info, [2]string{" └ Containers", fmt.Sprintf("%d", len(engine.Containers()))})
}
info = append(info, [2]string{" └ Reserved CPUs", fmt.Sprintf("%d / %d", engine.UsedCpus(), engine.TotalCpus())})
info = append(info, [2]string{" └ Reserved Memory", fmt.Sprintf("%s / %s", units.BytesSize(float64(engine.UsedMemory())), units.BytesSize(float64(engine.TotalMemory())))})
labels := make([]string, 0, len(engine.Labels))

3
test/integration/api/info.bats
View File

@ -31,15 +31,18 @@ function teardown() {
run docker_swarm info
[ "$status" -eq 0 ]
[[ "${output}" == *"Running: 1"* ]]
[[ "${output}" == *"Containers: 1 (1 Running, 0 Paused, 0 Stopped)"* ]]
docker_swarm pause test
run docker_swarm info
[ "$status" -eq 0 ]
[[ "${output}" == *"Paused: 1"* ]]
[[ "${output}" == *"Containers: 1 (0 Running, 1 Paused, 0 Stopped)"* ]]
docker_swarm unpause test
docker_swarm kill test
run docker_swarm info
[ "$status" -eq 0 ]
[[ "${output}" == *"Stopped: 1"* ]]
[[ "${output}" == *"Containers: 1 (0 Running, 0 Paused, 1 Stopped)"* ]]
}