Only update non-terminal tasks on node removal. #2867
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When a node is removed, its tasks are set in state ORPHANED. This does not need to be done for tasks that are already in a terminal state, and if all tasks in all states are updated, the size of the transaction may grow too large to process, and node removal becomes impossible. This changes to only set non-terminal tasks to state ORPHANED, and terminal tasks are left alone. Signed-off-by: Drew Erny <drew.erny@docker.com>
|
LGTM 👍 |
dani-docker
pushed a commit
to dani-docker/swarmkit
that referenced
this pull request
Jul 26, 2019
Only update non-terminal tasks on node removal.
dani-docker
pushed a commit
to dani-docker/swarmkit
that referenced
this pull request
Jul 26, 2019
Only update non-terminal tasks on node removal.
This was referenced Jul 26, 2019
| 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 |
There was a problem hiding this comment.
nice fix brah! @dperny
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Aug 8, 2019
full diff: moby/swarmkit@19e791f...142a737 included: - moby/swarmkit#2872 [19.03 backport] Only update non-terminal tasks on node removal - backport of moby/swarmkit#2867 Only update non-terminal tasks on node removal Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Aug 8, 2019
…3 branch) full diff: moby/swarmkit@961ec3a...4fb9e96 included: - moby/swarmkit#2873 [19.03 backport] Only update non-terminal tasks on node removal - backport of moby/swarmkit#2867 Only update non-terminal tasks on node removal Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Aug 9, 2019
full diff: moby/swarmkit@19e791f...142a737 included: - moby/swarmkit#2872 [19.03 backport] Only update non-terminal tasks on node removal - backport of moby/swarmkit#2867 Only update non-terminal tasks on node removal Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 7fcfdbaab6d8c6a2d55ad7b72a851c5e92b360ac Component: engine
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Aug 9, 2019
…3 branch) full diff: moby/swarmkit@961ec3a...4fb9e96 included: - moby/swarmkit#2873 [19.03 backport] Only update non-terminal tasks on node removal - backport of moby/swarmkit#2867 Only update non-terminal tasks on node removal Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: ee64eae9034a2cd3edd751632961e6895b069d1d Component: engine
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Oct 7, 2019
full diff: moby/swarmkit@7dded76...a8bbe7d changes included: - moby/swarmkit#2867 Only update non-terminal tasks on node removal - related to moby/swarmkit#2806 Fix leaking task resources when nodes are deleted - moby/swarmkit#2880 Bump to golang 1.12.9 - moby/swarmkit#2886 Bump vendoring to match current docker/docker master - regenerates protobufs - moby/swarmkit#2890 Remove hardcoded IPAM config subnet value for ingress network - fixes [ENGORC-2651] Specifying --default-addr-pool for docker swarm init is not picked up by ingress network Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Oct 21, 2019
full diff: moby/swarmkit@7dded76...a8bbe7d changes included: - moby/swarmkit#2867 Only update non-terminal tasks on node removal - related to moby/swarmkit#2806 Fix leaking task resources when nodes are deleted - moby/swarmkit#2880 Bump to golang 1.12.9 - moby/swarmkit#2886 Bump vendoring to match current docker/docker master - regenerates protobufs - moby/swarmkit#2890 Remove hardcoded IPAM config subnet value for ingress network - fixes [ENGORC-2651] Specifying --default-addr-pool for docker swarm init is not picked up by ingress network Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
When a node is removed, its tasks are set in state ORPHANED. This does not need to be done for tasks that are already in a terminal state, and if all tasks in all states are updated, the size of the transaction may grow too large to process, and node removal becomes impossible.
This changes to only set non-terminal tasks to state ORPHANED, and terminal tasks are left alone.
- How I did it
Altered the
orphanNodeTasksfunction inmanager/controlapi/node.goto check if a task is in a terminal state before updating it.- How to test it
Updated the unit test for that function to check correctness of the new behavior.
- Description for the changelog
Fixed an issue where nodes with lots of tasks could not be removed.