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

Merge pull request #237 from aaronlehmann/progress-before-assignment 

progress: Show progress of replicated tasks before they are assigned
This commit is contained in:
Sebastiaan van Stijn 2017-06-26 17:14:07 -07:00 committed by GitHub
parent 3648a8b9d0 d3d09f67b1
commit 2f58992f85
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/command/service/progress/progress.go
View File

@ -275,7 +275,11 @@ func (u *replicatedProgressUpdater) update(service swarm.Service, tasks []swarm.
continue continue
} }
} }
if _, nodeActive := activeNodes[task.NodeID]; nodeActive { if task.NodeID != "" {
if _, nodeActive := activeNodes[task.NodeID]; nodeActive {
tasksBySlot[task.Slot] = task
}
} else {
tasksBySlot[task.Slot] = task tasksBySlot[task.Slot] = task
} }
} }