New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Nov 20, 2017

Conversation

Projects
None yet
4 participants
@thaJeztah
Member

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

Delete node attachments when node is removed
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>
@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot 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

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
@nishanttotla

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

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Nov 20, 2017

Member

Yes, no conflicts 👍

Member

thaJeztah commented Nov 20, 2017

Yes, no conflicts 👍

@anshulpundir anshulpundir merged commit 744f6ee into docker:bump_v17.09 Nov 20, 2017

3 checks passed

ci/circleci Your tests passed on CircleCI!
Details
codecov/project 60.39% (target 0%)
Details
dco-signed All commits are signed

@thaJeztah thaJeztah deleted the thaJeztah:17.09-backport-workaround-attachments branch Nov 20, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment