Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

consensus: stricter on LastCommitRound check #4970

Merged
merged 8 commits into from Jun 10, 2020
Merged

consensus: stricter on LastCommitRound check #4970

merged 8 commits into from Jun 10, 2020

Conversation

melekes
Copy link
Contributor

@melekes melekes commented Jun 5, 2020

Closes #2737

cuonglm and others added 5 commits January 3, 2020 16:01
@cuonglm
consensus: run ValidateBasic sub-tests in parallel
114396b 
Update #2737
@cuonglm
consensus: stricter on LastCommitRound check
6a3f750 
LastCommitRound should always be >= 0 for heights > 1.

In State.updateToState, last precommit is computed  only when round
greater than -1 and has votes. But "LastCommit" is always updated
regardless of the condition. If there's no last precommit, "LastCommit"
is set to (*types.VoteSet)(nil). That's why "LastCommit" can be -1 for
heights > 1.

To fix it, only update State.RoundState.LastCommit when there is last
precommit.

Fixes #2737
@melekes
Merge branch 'master' into 2737
4465a89
@melekes
remove t.Parallel calls
4f17c06
@melekes
better panic msg
3597773
@auto-comment
Copy link

auto-comment bot commented Jun 5, 2020 •
edited by melekes

👋 Thanks for creating a PR!

Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Wrote tests
  • Updated CHANGELOG_PENDING.md
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Updated relevant documentation (docs/) and code comments
  • Re-reviewed Files changed in the Github PR explorer
  • Applied Appropriate Labels

Thank you for your contribution to Tendermint! 🚀

@melekes melekes mentioned this pull request Jun 5, 2020
Closed
5 tasks
@melekes
Copy link
Contributor Author

melekes commented Jun 5, 2020

tendermint/consensus/reactor.go

Line 103 in 2737d3a

conR.conS.reconstructLastCommit(state)
line does not make any sense since we (before this PR) override cs.LastCommit in any case with another value...

@melekes melekes added the R:minor Release: Minor label Jun 5, 2020
@melekes melekes self-assigned this Jun 5, 2020
@codecov
Copy link

codecov bot commented Jun 5, 2020 •
edited

Codecov Report

Merging #4970 into master will decrease coverage by 0.15%.
The diff coverage is 44.44%.

@@            Coverage Diff             @@
##           master    #4970      +/-   ##
==========================================
- Coverage   63.38%   63.22%   -0.16%     
==========================================
  Files         181      181              
  Lines       19080    19088       +8     
==========================================
- Hits        12093    12069      -24     
- Misses       5963     5986      +23     
- Partials     1024     1033       +9
Impacted Files Coverage Δ
consensus/reactor.go 72.61% <33.33%> (-2.85%) ⬇️
consensus/state.go 70.78% <46.66%> (-0.56%) ⬇️
consensus/ticker.go 91.66% <0.00%> (-4.17%) ⬇️
consensus/replay.go 71.72% <0.00%> (-0.85%) ⬇️
blockchain/v1/reactor.go 71.73% <0.00%> (-0.36%) ⬇️
blockchain/v0/pool.go 79.29% <0.00%> (+0.63%) ⬆️
p2p/pex/pex_reactor.go 82.01% <0.00%> (+1.05%) ⬆️

@melekes melekes marked this pull request as ready for review June 5, 2020 14:29
@melekes melekes requested a review from tessr as a code owner June 5, 2020 14:29
cmwaters
cmwaters approved these changes Jun 9, 2020
View reviewed changes
Copy link
Contributor

@cmwaters cmwaters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@melekes melekes merged commit 65909a1 into master Jun 10, 2020
@melekes melekes deleted the 2737 branch June 10, 2020 07:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cmwaters cmwaters cmwaters approved these changes

@tessr tessr Awaiting requested review from tessr

Assignees

@melekes melekes

Labels
R:minor Release: Minor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

LastCommitRound can be -1 for heights > 1
3 participants
@melekes @cmwaters @cuonglm