Merge pull request #147 from binance-chain/no_panic

[R4R]fix not panic when do not have block under state sync

CHANGELOG.md

@@ -1,10 +1,13 @@
 # Changelog
 
+## v0.32.3-binance.3
+- [sync] [\#147](https://github.com/binance-chain/bnc-tendermint/pull/147) fix not panic when do not have block under state sync
+
 ## v0.32.3-binance.2
 ### BUG FIXES:
 - [status] [\#140](https://github.com/binance-chain/bnc-tendermint/pull/140) fix hot sync not a catched up status
-- [consensus] [\#140](https://github.com/binance-chain/bnc-tendermint/pull/141)  fix bug in load last validator set
-- [index] [\#140](https://github.com/binance-chain/bnc-tendermint/pull/142) fix index height can not set after state sync
+- [consensus] [\#141](https://github.com/binance-chain/bnc-tendermint/pull/141)  fix bug in load last validator set
+- [index] [\#142](https://github.com/binance-chain/bnc-tendermint/pull/142) fix index height can not set after state sync
 
 ## v0.32.3-binance.1
 

consensus/reactor.go

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

node/node.go

@@ -929,6 +929,7 @@ func (n *Node) ConfigureRPC() {
 	rpccore.SetEventBus(n.eventBus)
 	rpccore.SetLogger(n.Logger.With("module", "rpc"))
 	rpccore.SetConfig(*n.config.RPC)
+	rpccore.SetHotSync(n.config.HotSync)
 }
 
 func (n *Node) startRPC() ([]net.Listener, error) {

rpc/core/pipe.go

@@ -83,7 +83,8 @@ var (
 
 	logger log.Logger
 
-	config cfg.RPCConfig
+	config  cfg.RPCConfig
+	hotSync bool
 )
 
 func SetStateDB(db dbm.DB) {
@@ -159,6 +160,10 @@ func SetConfig(c cfg.RPCConfig) {
 	config = c
 }
 
+func SetHotSync(h bool) {
+	hotSync = h
+}
+
 func validatePage(page, perPage, totalCount int) (int, error) {
 	if perPage < 1 {
 		panic(fmt.Sprintf("zero or negative perPage: %d", perPage))

rpc/core/status.go

@@ -74,7 +74,7 @@ import (
 // ```
 func Status(ctx *rpctypes.Context) (*ctypes.ResultStatus, error) {
 	var latestHeight int64
-	if consensusReactor.FastSync() {
+	if consensusReactor.FastSync() || hotSync {
 		latestHeight = blockStore.Height()
 	} else {
 		latestHeight = consensusState.GetLastHeight()