@@ -130,7 +130,7 @@ github.com/containerd/ttrpc                         f02858b1457c5ca3aaec3a0803eb

 github.com/gogo/googleapis                          d31c731455cb061f42baff3bda55bad0118b126b # v1.2.0

 # cluster

-github.com/docker/swarmkit                          961ec3a56b7b6c311a2137b6a398f9d778fba94b # bump_v19.03 branch

+github.com/docker/swarmkit                          4fb9e961aba635f0240a140e89ece6d6c2082585 # bump_v19.03 branch

 github.com/gogo/protobuf                            ba06b47c162d49f2af050fb4c75bcbc86a159d5c # v1.2.1

 github.com/cloudflare/cfssl                         5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2

 github.com/fernet/fernet-go                         1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2

@@ -265,12 +265,23 @@ func orphanNodeTasks(tx store.Tx, nodeID string) error {

 		return err

 	}

 	for _, task := range tasks {

-		task.Status = api.TaskStatus{

-			Timestamp: gogotypes.TimestampNow(),

-			State:     api.TaskStateOrphaned,

-			Message:   "Task belonged to a node that has been deleted",

+		// this operation must occur within the same transaction boundary. If

+		// we cannot accomplish this task orphaning in the same transaction, we

+		// could crash or die between transactions and not get a chance to do

+		// this. however, in cases were there is an exceptionally large number

+		// of tasks for a node, this may cause the transaction to exceed the

+		// max message size.

+		//

+		// therefore, we restrict updating to only tasks in a non-terminal

+		// state. Tasks in a terminal state do not need to be updated.

+		if task.Status.State < api.TaskStateCompleted {

+			task.Status = api.TaskStatus{

+				Timestamp: gogotypes.TimestampNow(),

+				State:     api.TaskStateOrphaned,

+				Message:   "Task belonged to a node that has been deleted",

+			}

+			store.UpdateTask(tx, task)

 		}

-		store.UpdateTask(tx, task)

 	}

 	return nil

 }