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.

Sign up for GitHub

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

Jump to bottom

[18.03] Adjust corner case for reconnect logic #2226

Merged
merged 1 commit into from
Jul 10, 2018
Merged

[18.03] Adjust corner case for reconnect logic #2226

merged 1 commit into from
Jul 10, 2018

Conversation

thaJeztah
Copy link
Member

Backport of #2200 for 18.03

git checkout -b 18.03-backport-networkdb-retry upstream/bump_18.03
git cherry-pick -s -S -x 843a0e4267697fbd7806f6a667621b69f0c63a43
git push -u origin

cherry-pick was clean, no conflits

ping @fcrisciani @ctelfer PTAL

Previous logic was not accounting that each node is
in the node list so the bootstrap nodes won't retry
to reconnect because they will always find themselves
in the node map
Added test that validate the gossip island condition

@thaJeztah
Adjust corner case for reconnect logic
e276487 
Previous logic was not accounting that each node is
in the node list so the bootstrap nodes won't retry
to reconnect because they will always find themselves
in the node map
Added test that validate the gossip island condition

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit 843a0e4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
ctelfer
ctelfer approved these changes Jul 10, 2018
View reviewed changes
Copy link
Contributor

@ctelfer ctelfer left a comment

Choose a reason for hiding this comment

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

LGTM

fcrisciani
fcrisciani approved these changes Jul 10, 2018
View reviewed changes
Copy link

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

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

LGTM

@fcrisciani fcrisciani merged commit 99de6ed into moby:bump_18.03 Jul 10, 2018
@thaJeztah thaJeztah deleted the 18.03-backport-networkdb-retry branch July 10, 2018 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ctelfer ctelfer ctelfer approved these changes

@fcrisciani fcrisciani fcrisciani approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @fcrisciani @ctelfer