Merge pull request #97 from andrewhsu/fix-progress

[17.06] progress: Show progress of replicated tasks before they are assigned
docker-archive · Jul 11, 2017 · 38f7bac · 38f7bac
2 parents 2036e34 + f9cb056
commit 38f7bac
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/components/cli/cli/command/service/progress/progress.go b/components/cli/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
 		}
 	}