Backport FAB-15461: Fix election adapter to return correct peers #1054
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
1. Make the adapter between the gossip layer to the leader election layer return peers that have channel membership instead of basic membership 2. Export IsInMyOrg() in gossipServiceImpl so it could be used in the election adapter 3. Update Gossip counterfeiter mocks in discovery/support/mocks 4. Release RLock in peerMockGossip when g.cluster is nil Change-Id: Ic3dc422e527a0778844851414387e480d23aee65 Signed-off-by: ronenschafferibm <[email protected]> Signed-off-by: yacovm <[email protected]>
yacovm
force-pushed
the
FAB-15461-release-1.4
branch
from
5e831cf to
084ee9c
Compare
mastersingh24
approved these changes
Apr 10, 2020
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.
return peers that have channel membership instead of basic membership
election adapter
Yacov: Without this commit, peers that join a channel they were not part of at genesis and other peers of their org are already in this channel, are stuck at genesis because they never elect themselves as leader (because they receive leadership declarations from existing peers in their org) but also don't sync from other peers due to rejecting all state info messages.
This change set fixes this by making these peers filter the leadership declarations and thus making them thing they are alone in the channel and elect themselves as leaders.
Change-Id: Ic3dc422e527a0778844851414387e480d23aee65
Signed-off-by: ronenschafferibm [email protected]
Signed-off-by: yacovm [email protected]