Skip to content
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.06] Delete node attachments when node is removed #2414

Merged
merged 1 commit into from
Oct 18, 2017

Conversation

dperny
Copy link
Collaborator

@dperny dperny commented Oct 18, 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.

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

@andrewhsu
Copy link
Member

@dperny was this with a cherry-pick command? e.g.

$ git cherry-pick -s -x badbeef

If so, did it go in clean or did you have to resolve conflicts?

reference: backport of #2409 Delete node attachments when node is removed

@dperny
Copy link
Collaborator Author

dperny commented Oct 18, 2017

@andrewhsu the cherry-pick was clean, and done with

git cherry-pick <commitidihaveforgotten>

I passed no flags.

@andrewhsu
Copy link
Member

@dperny if you could redo the commit with the git cherry-pick -s -x flags that would make future selves easier to track source of code. I usually put the cherry-pick command in the PR description along with statement of whether it went clean or not.

@dperny dperny force-pushed the bump_v17.06.0-cherry-pick-2409 branch from 7e15fe7 to 8f2402f Compare October 18, 2017 23:31
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 with `git cherry-pick -sx`, applied cleanly.

(cherry picked from commit 0c7b2fc)
Signed-off-by: Drew Erny <drew.erny@docker.com>
@dperny dperny force-pushed the bump_v17.06.0-cherry-pick-2409 branch from 8f2402f to bc87b34 Compare October 18, 2017 23:32
@dperny
Copy link
Collaborator Author

dperny commented Oct 18, 2017

@andrewhsu does this commit message look more your speed?

Copy link
Member

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@codecov
Copy link

codecov bot commented Oct 18, 2017

Codecov Report

Merging #2414 into bump_v17.06 will decrease coverage by 0.02%.
The diff coverage is 59.09%.

@@               Coverage Diff               @@
##           bump_v17.06    #2414      +/-   ##
===============================================
- Coverage        59.91%   59.89%   -0.03%     
===============================================
  Files              120      120              
  Lines            25106    25128      +22     
===============================================
+ Hits             15043    15051       +8     
- Misses            8726     8743      +17     
+ Partials          1337     1334       -3

@dperny dperny merged commit a5b8d5f into moby:bump_v17.06 Oct 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants