Merge pull request #1957 from dongluochen/bump_v1.13.2

aaronlehmann · web-flow · commit 00e6dde43360 · 2017-02-14T17:59:38.000-08:00
Global orchestrator reconcileServices should look at desired state only
diff --git a/manager/orchestrator/global/global.go b/manager/orchestrator/global/global.go
@@ -504,7 +504,7 @@ func (g *Orchestrator) removeTasks(ctx context.Context, batch *store.Batch, task
 }
 
 func isTaskRunning(t *api.Task) bool {
-	return t != nil && t.DesiredState <= api.TaskStateRunning && t.Status.State <= api.TaskStateRunning
+	return t != nil && t.DesiredState <= api.TaskStateRunning
 }
 
 func isTaskCompleted(t *api.Task, restartPolicy api.RestartPolicy_RestartCondition) bool {

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ func (g Orchestrator) removeTasks(ctx context.Context, batch store.Batch, task`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`func isTaskRunning(t *api.Task) bool {`
`507`		`- return t != nil && t.DesiredState <= api.TaskStateRunning && t.Status.State <= api.TaskStateRunning`
	`507`	`+ return t != nil && t.DesiredState <= api.TaskStateRunning`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`func isTaskCompleted(t *api.Task, restartPolicy api.RestartPolicy_RestartCondition) bool {`