toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not show tasks from down nodes as active in ls

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5d4401d6d72c647fa61501c40949b2d67c3f958b
Component: engine
This commit is contained in:
Tonis Tiigi
2016-06-22 14:48:57 -07:00
parent ebb89af810
commit a185c1fb92
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/engine/api/client/service/list.go
View File

@ -69,9 +69,20 @@ func runList(dockerCli *client.DockerCli, opts listOptions) error {
return err
}
nodes, err := client.NodeList(ctx, types.NodeListOptions{})
if err != nil {
return err
}
activeNodes := make(map[string]struct{})
for _, n := range nodes {
if n.Status.State == swarm.NodeStateReady {
activeNodes[n.ID] = struct{}{}
}
}
running := map[string]int{}
for _, task := range tasks {
if task.Status.State == "running" {
if _, nodeActive := activeNodes[task.NodeID]; nodeActive && task.Status.State == "running" {
running[task.ServiceID]++
}
}