mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-02-09 21:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

cs: don't panic when block is not found in store (#4163)

Browse Source 
Fixes #4069
This commit is contained in:
Greg Zaitsev
2019-11-21 10:47:59 +03:00
committed by Anton Kaliaev
parent f78a994e26
commit ee6601ad48
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG_PENDING.md
View File

@@ -3,7 +3,7 @@
\*\* \*\*
Special thanks to external contributors on this release: Special thanks to external contributors on this release:
@erikgrinaker, @PSalant726, @gchaincl @erikgrinaker, @PSalant726, @gchaincl, @gregzaitsev
Friendly reminder, we have a [bug bounty Friendly reminder, we have a [bug bounty
program](https://hackerone.com/tendermint). program](https://hackerone.com/tendermint).
@@ -73,3 +73,4 @@ program](https://hackerone.com/tendermint).
- [rpc][\#4141](https://github.com/tendermint/tendermint/pull/4141) JSONRPCClient: validate that Response.ID matches Request.ID - [rpc][\#4141](https://github.com/tendermint/tendermint/pull/4141) JSONRPCClient: validate that Response.ID matches Request.ID
- [rpc][\#4141](https://github.com/tendermint/tendermint/pull/4141) WSClient: check for unsolicited responses - [rpc][\#4141](https://github.com/tendermint/tendermint/pull/4141) WSClient: check for unsolicited responses
- [types][\4164](https://github.com/tendermint/tendermint/pull/4164) Prevent temporary power overflows on validator updates - [types][\4164](https://github.com/tendermint/tendermint/pull/4164) Prevent temporary power overflows on validator updates
- [cs] \#4069 Don't panic when block meta is not found in store (@gregzaitsev)

8
consensus/reactor.go
View File

@@ -501,10 +501,12 @@ OUTER_LOOP:
if prs.ProposalBlockParts == nil { if prs.ProposalBlockParts == nil {
blockMeta := conR.conS.blockStore.LoadBlockMeta(prs.Height) blockMeta := conR.conS.blockStore.LoadBlockMeta(prs.Height)
if blockMeta == nil { if blockMeta == nil {
panic(fmt.Sprintf("Failed to load block %d when blockStore is at %d", heightLogger.Error("Failed to load block meta",
prs.Height, conR.conS.blockStore.Height())) "blockstoreHeight", conR.conS.blockStore.Height())
time.Sleep(conR.conS.config.PeerGossipSleepDuration)
} else {
ps.InitProposalBlockParts(blockMeta.BlockID.PartsHeader)
} }
ps.InitProposalBlockParts(blockMeta.BlockID.PartsHeader)
// continue the loop since prs is a copy and not effected by this initialization // continue the loop since prs is a copy and not effected by this initialization
continue OUTER_LOOP continue OUTER_LOOP
} }