Cherry picks for the 1.12.x branch #1573
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@aboch can you pls point to all the docker issues that this cherry-pick brings in ? |
- This fixes a panic in memberlist.Leave() because called after memberlist.shutdown = false It happens because of two interlocking calls to NetworkDB.clusterLeave() It is easily reproducible with two back-to-back calls to docker swarm init && docker swarm leave --force While the first clusterLeave() is waiting for sendNodeEvent(NodeEventTypeLeave) to timeout (5 sec) a second clusterLeave() is called. The second clusterLeave() will end up invoking memberlist.Leave() after the previous call already did the same, therefore after memberlist.shutdown was set false. - The fix is to have agentClose() acquire the agent instance and reset the agent pointer right away under lock. Then execute the closing/leave functions on the agent instance. Signed-off-by: Alessandro Boch <[email protected]>
Signed-off-by: Alessandro Boch <[email protected]>
Signed-off-by: Alessandro Boch <[email protected]>
Signed-off-by: Santhosh Manohar <[email protected]>
- stop iterating after changing the list reference Signed-off-by: Alessandro Boch <[email protected]>
Signed-off-by: Alessandro Boch <[email protected]>
Signed-off-by: Alessandro Boch <[email protected]>
Signed-off-by: Alessandro Boch <[email protected]>
Signed-off-by: Santhosh Manohar <[email protected]>
Signed-off-by: Alessandro Boch <[email protected]>
Signed-off-by: Alessandro Boch <[email protected]>
Signed-off-by: Alessandro Boch <[email protected]>
|
@mavenugo I reduced the cherry-pick list. These are the referenced panic issues Also #1570 still needs to be review/merged and picked in here, which will solve |
|
#1573 fixes a panic that was seen by a user. But I don't think we have an issue in docker for that. |
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.