Skip to content

[17.09] Delete node attachments when node is removed#2456

Merged
anshulpundir merged 1 commit into
moby:bump_v17.09from
thaJeztah:17.09-backport-workaround-attachments
Nov 20, 2017
Merged

[17.09] Delete node attachments when node is removed#2456
anshulpundir merged 1 commit into
moby:bump_v17.09from
thaJeztah:17.09-backport-workaround-attachments

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Nov 20, 2017

Cherry-pick of #2409 for 17.09

git checkout -b 17.09-backport-workaround-attachments upstream/bump_v17.09
git cherry-pick -s -S -x 0c7b2fc23685c6ab80f2d1c82ce63d66dd3f25ba

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 picked from commit 0c7b2fc)

ping @dperny @anshulpundir PTAL

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.

Signed-off-by: Drew Erny <drew.erny@docker.com>
(cherry picked from commit 0c7b2fc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 17.09-backport-workaround-attachments branch from 41eb117 to f51bdb6 Compare November 20, 2017 13:02
@codecov
Copy link
Copy Markdown

codecov Bot commented Nov 20, 2017

Codecov Report

Merging #2456 into bump_v17.09 will increase coverage by 0.19%.
The diff coverage is 59.09%.

@@               Coverage Diff               @@
##           bump_v17.09    #2456      +/-   ##
===============================================
+ Coverage         60.2%   60.39%   +0.19%     
===============================================
  Files              128      128              
  Lines            26170    26192      +22     
===============================================
+ Hits             15755    15819      +64     
+ Misses            9033     8984      -49     
- Partials          1382     1389       +7

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.

@thaJeztah just confirming that the cherry-pick was clean?

@thaJeztah
Copy link
Copy Markdown
Member Author

Yes, no conflicts 👍

@anshulpundir anshulpundir merged commit 744f6ee into moby:bump_v17.09 Nov 20, 2017
@thaJeztah thaJeztah deleted the 17.09-backport-workaround-attachments branch November 20, 2017 23:32
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