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

progress: Show progress of replicated tasks before they are assigned
2017-06-26 17:14:07 -07:00
parent 3648a8b9d0 d3d09f67b1
commit 2f58992f85
1 changed files with 5 additions and 1 deletions
--- a/cli/command/service/progress/progress.go
+++ b/cli/command/service/progress/progress.go
@ -275,7 +275,11 @@ func (u *replicatedProgressUpdater) update(service swarm.Service, tasks []swarm.
 				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
 		}
 	}