Fix node freeze after re-enabling consensus [ERC-3111] #1592
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
alekseysidorov
added
bug 🪲
work in progress 🚧
alekseysidorov
requested review from
aleksuss,
popzxc and
slowli
as code owners
alekseysidorov
force-pushed
the
hotfix_consensus_reenable_bug
branch
from
46700a5
to
8a213f1
Compare
alekseysidorov
removed
the
work in progress 🚧
popzxc
reviewed
Dec 4, 2019
vitvakatu
reviewed
Dec 4, 2019
Codecov Report
@@ Coverage Diff @@
## master #1592 +/- ##
==========================================
- Coverage 93.79% 93.57% -0.22%
==========================================
Files 204 204
Lines 30302 30304 +2
==========================================
- Hits 28421 28358 -63
- Misses 1881 1946 +65
Continue to review full report at Codecov.
|
popzxc
approved these changes
Dec 4, 2019
vitvakatu
reviewed
Dec 4, 2019
Co-Authored-By: Ilya Bogdanov <ilya.bogdanov@xdev.re>
alekseysidorov
changed the title
vitvakatu
approved these changes
Dec 4, 2019
slowli
reviewed
Dec 4, 2019
exonum/src/node/consensus.rs
Outdated
| @@ -857,6 +857,14 @@ impl NodeHandler { | |||
| if let Some(peer) = self.state.retry(data, peer) { | |||
| self.add_request_timeout(data.clone(), Some(peer)); | |||
|
|
|||
| if !self.is_enabled { | |||
| trace!( | |||
| "Do not send a request {:?} because the node is paused.", | |||
There was a problem hiding this comment.
Nit: "Not sending a request..." makes more sense from the grammar perspective, I believe.
exonum/src/node/consensus.rs
Outdated
| @@ -978,6 +986,11 @@ impl NodeHandler { | |||
| /// Requests a block for the next height from all peers with a bigger height. Called when the | |||
| /// node tries to catch up with other nodes' height. | |||
| pub(crate) fn request_next_block(&mut self) { | |||
| if !self.is_enabled { | |||
| trace!("Do not send a request for the next block because the node is paused.",); | |||
There was a problem hiding this comment.
Nit: Bogus comma; also "Not sending a request..." would make more sense grammatically.
aleksuss
approved these changes
Dec 4, 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.
No description provided.