Skip to content

[backport, 18.03] RoleManager will remove deleted nodes from the cluster membership - #2608

Merged
cyli merged 3 commits into
moby:bump_v18.03from
cyli:backport-rolemanager-18.03
May 2, 2018
Merged

cyli merged 3 commits into
moby:bump_v18.03from
cyli:backport-rolemanager-18.03

Conversation

@cyli

@cyli cyli commented Apr 17, 2018

Copy link
Copy Markdown
Contributor

Backports #2551 to 18.03.

cyli and others added 3 commits May 2, 2018 11:57
both on startup and while a node is demoted while it's running.  Also add
a failing test, where the roleManager should remove deleted nodes from
the cluster membership on startup.

These tests involve injecting a fake clock source into roleManager.

Signed-off-by: cyli <cyli@twistedmatrix.com>
(cherry picked from commit 1d68e61)
Signed-off-by: Ying Li <ying.li@docker.com>
…nger in

the raft store.

Signed-off-by: cyli <ying.li@docker.com>
(cherry picked from commit 5322ff5)
Signed-off-by: Ying Li <ying.li@docker.com>
… node that

is a manager can be removed if it hasn't joined the raft cluster yet.  However,
perhaps the raft conf change happens right after the check.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 36954b5)
Signed-off-by: Ying Li <ying.li@docker.com>
@cyli
cyli force-pushed the backport-rolemanager-18.03 branch from 29127f6 to fbb747c Compare May 2, 2018 18:57
@codecov

codecov Bot commented May 2, 2018

Copy link
Copy Markdown

Codecov Report

Merging #2608 into bump_v18.03 will increase coverage by 0.59%.
The diff coverage is 73.33%.

@@               Coverage Diff               @@
##           bump_v18.03    #2608      +/-   ##
===============================================
+ Coverage        61.46%   62.06%   +0.59%     
===============================================
  Files              133      133              
  Lines            21746    21770      +24     
===============================================
+ Hits             13366    13511     +145     
+ Misses            6944     6803     -141     
- Partials          1436     1456      +20

@cyli

cyli commented May 2, 2018

Copy link
Copy Markdown
Contributor Author

Rebased this after @nishanttotla's backport PR #2616 was merged, since that fixes the test flakiness.

@cyli
cyli merged commit 2408732 into moby:bump_v18.03 May 2, 2018
@cyli
cyli deleted the backport-rolemanager-18.03 branch May 2, 2018 20:22
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.

3 participants