Skip to content

[v17.03] Cherry-pick Delete node attachments when node is removed#2417

Merged
nishanttotla merged 1 commit into
moby:bump_v17.03from
dperny:bump_v17.03-cherry-pick-2409
Oct 23, 2017
Merged

[v17.03] Cherry-pick Delete node attachments when node is removed#2417
nishanttotla merged 1 commit into
moby:bump_v17.03from
dperny:bump_v17.03-cherry-pick-2409

Conversation

@dperny
Copy link
Copy Markdown
Collaborator

@dperny dperny commented Oct 23, 2017

When a node is removed, delete all of its attachment tasks, so that any
networks being used by those tasks can be successfully removed.

Provides a workaround to the state where a node with attachments is
somehow removed from the cluster while attached to a network, preventing
the network from being removed. Does not fix many other related bugs.

Includes a unit test for the function that removes node attachment
tasks.

Cherry picks #2409 to 17.03. Cherry-pick applies cleanly.

(cherry picked from commit 0c7b2fc)

Signed-off-by: Drew Erny drew.erny@docker.com

Copy link
Copy Markdown
Contributor

@nishanttotla nishanttotla left a comment

Choose a reason for hiding this comment

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

LGTM

(need to also vendor #2377 to fix CI failure. Can merge once that is done)

@dperny
Copy link
Copy Markdown
Collaborator Author

dperny commented Oct 23, 2017

depends on #2418 to pass CI.

When a node is removed, delete all of its attachment tasks, so that any
networks being used by those tasks can be successfully removed.

Provides a workaround to the state where a node with attachments is
somehow removed from the cluster while attached to a network, preventing
the network from being removed. Does not fix many other related bugs.

Includes a unit test for the function that removes node attachment
tasks.

Cherry picks moby#2409 to 17.03. Cherry-pick applies cleanly.

(cherry picked from commit 0c7b2fc)

Signed-off-by: Drew Erny <drew.erny@docker.com>
@dperny dperny force-pushed the bump_v17.03-cherry-pick-2409 branch from 704b1c4 to 3395393 Compare October 23, 2017 19:45
@codecov
Copy link
Copy Markdown

codecov Bot commented Oct 23, 2017

Codecov Report

Merging #2417 into bump_v17.03 will increase coverage by 0.11%.
The diff coverage is 59.09%.

@@               Coverage Diff               @@
##           bump_v17.03    #2417      +/-   ##
===============================================
+ Coverage        55.78%   55.89%   +0.11%     
===============================================
  Files              102      102              
  Lines            21532    21554      +22     
===============================================
+ Hits             12011    12047      +36     
+ Misses            8368     8362       -6     
+ Partials          1153     1145       -8

@nishanttotla nishanttotla merged commit 6ce875c into moby:bump_v17.03 Oct 23, 2017
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.

3 participants