Implement Commit message #1770
Merged
Implement Commit message #1770
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
majecty
force-pushed
the
f/commit-message
branch
2 times, most recently
from
d006da8
to
44c4034
Compare
majecty
force-pushed
the
f/commit-message
branch
from
c9b76d7
to
042694c
Compare
foriequal0
requested changes
Sep 11, 2019
| height, | ||
| }) => { | ||
| ctrace!(ENGINE, "Received RequestCommit for {} from {:?}", height, token); | ||
| let (result, receiver) = crossbeam::unbounded(); |
| votes, | ||
| }) => { | ||
| ctrace!(ENGINE, "Received Commit for {:?} from {:?}", height, token); | ||
| let (result, receiver) = crossbeam::unbounded(); |
| @@ -1780,50 +1836,48 @@ impl Worker { | |||
| } | |||
| } | |||
|
|
|||
| if peer_vote_step.height == self.height { | |||
There was a problem hiding this comment.
This condition cannot be removed.
!(self.height < peer_vote_step.height && !self.step.is_commit())
== self.height >= peer_vote_step.height || self.step.is_commit()
| #[allow(clippy::cognitive_complexity)] | ||
| fn on_commit_message( | ||
| &mut self, | ||
| height: Height, |
There was a problem hiding this comment.
Height is already in the block
| return None | ||
| } | ||
|
|
||
| if commit_height != self.height { |
There was a problem hiding this comment.
Suggested change
| if commit_height != self.height { | |
| else if commit_height > self.height { |
|
|
||
| if self.client().block(&BlockId::Hash(block_hash)).is_some() { | ||
| cdebug!(ENGINE, "Committed block is already imported {}", block_hash); | ||
| self.move_to_step( |
There was a problem hiding this comment.
Pull the common move_to_step out of the conditional statement.
Before this commit, Tendermint extension only requests current height and view's votes. Handling only the current view's message makes code simple. However, there may be a commit before the current view. This creates a liveness problem. After this commit, a node requests a Commit message if some of its peer's height is higher than the node. The commit message is not related to the node's current view. The Commit message fixes the liveness problem.
majecty
force-pushed
the
f/commit-message
branch
from
042694c
to
ddb887a
Compare
This was referenced Sep 18, 2019
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.
See #1768