Skip to content

[19.03 backport] Only update non-terminal tasks on node removal#2873

Merged
dperny merged 1 commit intomoby:bump_v19.03from
dani-docker:bp_v19.03_2867
Jul 29, 2019
Merged

[19.03 backport] Only update non-terminal tasks on node removal#2873
dperny merged 1 commit intomoby:bump_v19.03from
dani-docker:bp_v19.03_2867

Conversation

@dani-docker
Copy link
Contributor

@dani-docker dani-docker commented Jul 26, 2019

#2867

cc: @thaJeztah @dperny

- What I did

- How I did it

- How to test it

- Description for the changelog

@GordonTheTurtle

This comment has been minimized.

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 <[email protected]>
(cherry picked from commit d5df265)
Signed-off-by: Dani Louca <[email protected]>
@codecov
Copy link

codecov bot commented Jul 26, 2019

Codecov Report

Merging #2873 into bump_v19.03 will increase coverage by 0.06%.
The diff coverage is 100%.

@@               Coverage Diff               @@
##           bump_v19.03    #2873      +/-   ##
===============================================
+ Coverage         62.2%   62.27%   +0.06%     
===============================================
  Files              139      139              
  Lines            22313    22314       +1     
===============================================
+ Hits             13879    13895      +16     
+ Misses            6953     6940      -13     
+ Partials          1481     1479       -2

@dani-docker dani-docker changed the title Merge pull request #2867 from dperny/orphan-fewer-tasks (backport 19.03) Merge pull request #2867 from dperny/orphan-fewer-tasks [19.03 backport] Jul 26, 2019
@dani-docker dani-docker changed the title Merge pull request #2867 from dperny/orphan-fewer-tasks [19.03 backport] Only update non-terminal tasks on node removal. [19.03 backport] Jul 26, 2019
@thaJeztah thaJeztah changed the title Only update non-terminal tasks on node removal. [19.03 backport] [19.03 backport] Only update non-terminal tasks on node removal Jul 26, 2019
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@dperny dperny merged commit 4fb9e96 into moby:bump_v19.03 Jul 29, 2019
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 <[email protected]>
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 <[email protected]>
Upstream-commit: ee64eae9034a2cd3edd751632961e6895b069d1d
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants