Add current height response in fetch block RPC

leventeliu · leventeliu · commit 42a816bf0bff · 2019-08-07T23:53:22.000+08:00
diff --git a/sqlchain/chain.go b/sqlchain/chain.go
@@ -626,6 +626,10 @@ func (c *Chain) syncHead() (err error) {
 			atomic.AddUint32(&succCount, 1)
 			if resp.Block == nil {
 				ile.Debug("fetch block request reply: no such block")
+				// If block is nil, resp.Height returns the current head height of the remote peer
+				if resp.Height <= req.Height {
+					atomic.AddUint32(&initiatingCount, 1)
+				}
 				return
 			}
 
@@ -695,8 +699,8 @@ func (c *Chain) mainCycle(ctx context.Context) {
 			if err := c.syncHead(); err != nil {
 				if err != ErrInitiating {
 					c.logEntry().WithError(err).Error("failed to sync head")
+					continue
 				}
-				continue
 			}
 			if t, d := c.rt.nextTick(); d > 0 {
 				time.Sleep(d)
@@ -1217,3 +1221,7 @@ func (c *Chain) updateMetrics() {
 
 	c.expVars.Get(mwMinerChainBlockTimestamp).(*expvar.String).Set(b.Timestamp().String())
 }
+
+func (c *Chain) getCurrentHeight() int32 {
+	return c.rt.getHead().Height
+}
diff --git a/sqlchain/rpc.go b/sqlchain/rpc.go
@@ -57,5 +57,8 @@ func (s *ChainRPCService) AdviseNewBlock(req *AdviseNewBlockReq, resp *AdviseNew
 func (s *ChainRPCService) FetchBlock(req *FetchBlockReq, resp *FetchBlockResp) (err error) {
 	resp.Height = req.Height
 	resp.Block, err = s.chain.FetchBlock(req.Height)
+	if err == nil && resp.Block == nil {
+		resp.Height = s.chain.getCurrentHeight()
+	}
 	return
 }

Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,8 @@ func (s ChainRPCService) AdviseNewBlock(req AdviseNewBlockReq, resp *AdviseNew`
`57`	`57`	`func (s ChainRPCService) FetchBlock(req FetchBlockReq, resp *FetchBlockResp) (err error) {`
`58`	`58`	`resp.Height = req.Height`
`59`	`59`	`resp.Block, err = s.chain.FetchBlock(req.Height)`
	`60`	`+ if err == nil && resp.Block == nil {`
	`61`	`+ resp.Height = s.chain.getCurrentHeight()`
	`62`	`+ }`
`60`	`63`	`return`
`61`	`64`	`}`