fix: fetch chunk routine bug

yxq · 33cn · commit 1a5b5bef855d · 2021-09-27T14:49:49.000+08:00
diff --git a/blockchain/blockstore.go b/blockchain/blockstore.go
@@ -1719,7 +1719,6 @@ func (bs *BlockStore) deleteRecvChunkHash(num int64) error {
 func (bs *BlockStore) getRecvChunkHash(chunkNum int64) ([]byte, error) {
 	value, err := bs.GetKey(calcRecvChunkNumToHash(chunkNum))
 	if err != nil {
-		storeLog.Error("getRecvChunkHash", "chunkNum", chunkNum, "error", err)
 		return nil, err
 	}
 	var chunk types.ChunkInfo
diff --git a/blockchain/blocksyn.go b/blockchain/blocksyn.go
@@ -1203,7 +1203,7 @@ func (chain *BlockChain) FetchChunkBlockRoutine() {
 			_, safetyStart, safetyEnd := chain.CalcSafetyChunkInfo(chain.GetPeerMaxBlkHeight())
 			if chunkStart > safetyEnd {
 				if chain.GetBlockHeight() > safetyStart {
-					break
+					return
 				}
 				// 执行速度跟不上下载速度，此时不能直接退出，可能执行一段时间后又有新的chunk需要下载
 				time.Sleep(time.Second * 5)

Original file line number	Diff line number	Diff line change
`@@ -1719,7 +1719,6 @@ func (bs *BlockStore) deleteRecvChunkHash(num int64) error {`
`1719`	`1719`	`func (bs *BlockStore) getRecvChunkHash(chunkNum int64) ([]byte, error) {`
`1720`	`1720`	`value, err := bs.GetKey(calcRecvChunkNumToHash(chunkNum))`
`1721`	`1721`	`if err != nil {`
`1722`		`- storeLog.Error("getRecvChunkHash", "chunkNum", chunkNum, "error", err)`
`1723`	`1722`	`return nil, err`
`1724`	`1723`	`}`
`1725`	`1724`	`var chunk types.ChunkInfo`
Original file line number	Diff line number	Diff line change
`@@ -1203,7 +1203,7 @@ func (chain *BlockChain) FetchChunkBlockRoutine() {`
`1203`	`1203`	`_, safetyStart, safetyEnd := chain.CalcSafetyChunkInfo(chain.GetPeerMaxBlkHeight())`
`1204`	`1204`	`if chunkStart > safetyEnd {`
`1205`	`1205`	`if chain.GetBlockHeight() > safetyStart {`
`1206`		`- break`
	`1206`	`+ return`
`1207`	`1207`	`}`
`1208`	`1208`	`// 执行速度跟不上下载速度，此时不能直接退出，可能执行一段时间后又有新的chunk需要下载`
`1209`	`1209`	`time.Sleep(time.Second * 5)`