[FAB-18401] Remove unreachable and unnecessary code in gossip membership (bp #2293) #2296
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
In gossip, alive messages are stored in membership stores, and they also have logical timestamps. When a peer learns of an alive message with a higher logical timestamp of its latest alive message (for a specific peer), it enters learnExistingMembers() and tentatively updates the latest envelope and gossip message of what is store in the membership store. However, for completeness, the code checks if the membership store already contains an earlier instance, and if not, populates the membership store with a new instance. This population is not needed, because the code only enters the function if it already knows the peer, hence the membership store contains an earlier instance. This commit simply removes the unneeded code path where the instance is unknown despite the fact that we know about the peer already. Change-Id: I86bc65d881a440c267275a697853a1ead087df18 Signed-off-by: Yacov Manevich <[email protected]>
yacovm
force-pushed
the
mergify/bp/release-1.4/pr-2293
branch
from
64f1fd2 to
9e281dc
Compare
yacovm
approved these changes
Jan 18, 2021
yacovm
added a commit
to yacovm/fabric
that referenced
this pull request
Feb 15, 2021
…dger#2296) In gossip, alive messages are stored in membership stores, and they also have logical timestamps. When a peer learns of an alive message with a higher logical timestamp of its latest alive message (for a specific peer), it enters learnExistingMembers() and tentatively updates the latest envelope and gossip message of what is store in the membership store. However, for completeness, the code checks if the membership store already contains an earlier instance, and if not, populates the membership store with a new instance. This population is not needed, because the code only enters the function if it already knows the peer, hence the membership store contains an earlier instance. This commit simply removes the unneeded code path where the instance is unknown despite the fact that we know about the peer already. Change-Id: I86bc65d881a440c267275a697853a1ead087df18 Signed-off-by: Yacov Manevich <[email protected]> Co-authored-by: Yacov Manevich <[email protected]>
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.
This is an automatic backport of pull request #2293 done by Mergify.
Cherry-pick of a4a8520 has failed:
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/