Merge pull request #185 from thaJeztah/18.09_backport_fix_leaking_task_resources
[18.09] bump docker/swarmkit 19e791fd6dc76e8e894cbc99 (18.09 branch)
diff --git a/vendor.conf b/vendor.conf
index 6d3c458..0f48939 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -130,7 +130,7 @@
github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef
# cluster
-github.com/docker/swarmkit c66ed60822d3fc3bf6e17a505ee79014f449ef05 # bump_v18.09 branch
+github.com/docker/swarmkit 19e791fd6dc76e8e894cbc99b77f946b7d00ebb9 # bump_v18.09 branch
github.com/gogo/protobuf v1.0.0
github.com/cloudflare/cfssl 1.3.2
github.com/fernet/fernet-go 1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2
diff --git a/vendor/github.com/docker/swarmkit/manager/controlapi/node.go b/vendor/github.com/docker/swarmkit/manager/controlapi/node.go
index 68a759f..5308b74 100644
--- a/vendor/github.com/docker/swarmkit/manager/controlapi/node.go
+++ b/vendor/github.com/docker/swarmkit/manager/controlapi/node.go
@@ -254,25 +254,23 @@
}, nil
}
-func removeNodeAttachments(tx store.Tx, nodeID string) error {
- // orphan the node's attached containers. if we don't do this, the
- // network these attachments are connected to will never be removeable
+func orphanNodeTasks(tx store.Tx, nodeID string) error {
+ // when a node is deleted, all of its tasks are irrecoverably removed.
+ // additionally, the Dispatcher can no longer be relied on to update the
+ // task status. Therefore, when the node is removed, we must additionally
+ // move all of its assigned tasks to the Orphaned state, so that their
+ // resources can be cleaned up.
tasks, err := store.FindTasks(tx, store.ByNodeID(nodeID))
if err != nil {
return err
}
for _, task := range tasks {
- // if the task is an attachment, then we just delete it. the allocator
- // will do the heavy lifting. basically, GetAttachment will return the
- // attachment if that's the kind of runtime, or nil if it's not.
- if task.Spec.GetAttachment() != nil {
- // don't delete the task. instead, update it to `ORPHANED` so that
- // the taskreaper will clean it up.
- task.Status.State = api.TaskStateOrphaned
- if err := store.UpdateTask(tx, task); err != nil {
- return err
- }
+ task.Status = api.TaskStatus{
+ Timestamp: gogotypes.TimestampNow(),
+ State: api.TaskStateOrphaned,
+ Message: "Task belonged to a node that has been deleted",
}
+ store.UpdateTask(tx, task)
}
return nil
}
@@ -342,7 +340,7 @@
return err
}
- if err := removeNodeAttachments(tx, request.NodeID); err != nil {
+ if err := orphanNodeTasks(tx, request.NodeID); err != nil {
return err
}
