fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-30 13:11:38 +00:00
Code Issues Projects Releases Wiki Activity

consensus: ensure prs.ProposalBlockParts is initialized. fixes #810

Browse Source
This commit is contained in:
Ethan Buchman
2017-11-07 17:14:40 +00:00
parent ec87c740a7
commit 3b81d3fea4
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
consensus/reactor.go
View File

@ -499,6 +499,20 @@ OUTER_LOOP:
func (conR *ConsensusReactor) gossipDataForCatchup(logger log.Logger, rs *cstypes.RoundState, func (conR *ConsensusReactor) gossipDataForCatchup(logger log.Logger, rs *cstypes.RoundState,
prs *cstypes.PeerRoundState, ps *PeerState, peer p2p.Peer) { prs *cstypes.PeerRoundState, ps *PeerState, peer p2p.Peer) {
// this might happen if we didn't receive the commit message from the peer
// NOTE: wouldn't it be better if the peer resubmitted his CommitStepMessage periodically if not progressing?
if prs.ProposalBlockParts == nil {
blockMeta := conR.conS.blockStore.LoadBlockMeta(prs.Height)
if blockMeta == nil {
logger.Error("Failed to load block meta",
"ourHeight", rs.Height, "blockstoreHeight", conR.conS.blockStore.Height())
time.Sleep(conR.conS.config.PeerGossipSleep())
return
}
prs.ProposalBlockPartsHeader = blockMeta.BlockID.PartsHeader
prs.ProposalBlockParts = cmn.NewBitArray(blockMeta.BlockID.PartsHeader.Total)
}
if index, ok := prs.ProposalBlockParts.Not().PickRandom(); ok { if index, ok := prs.ProposalBlockParts.Not().PickRandom(); ok {
// Ensure that the peer's PartSetHeader is correct // Ensure that the peer's PartSetHeader is correct
blockMeta := conR.conS.blockStore.LoadBlockMeta(prs.Height) blockMeta := conR.conS.blockStore.LoadBlockMeta(prs.Height)