[stream] elaborate one logger message and updated discover batch to f…

…ix local test
harmony-one · Feb 23, 2021 · e06dad8 · e06dad8
1 parent 3466c9d
commit e06dad8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/cmd/harmony/default.go b/cmd/harmony/default.go
@@ -124,7 +124,7 @@ var (
 		DiscSoftLowCap: 2,
 		DiscHardLowCap: 2,
 		DiscHighCap:    1024,
-		DiscBatch:      2,
+		DiscBatch:      5,
 	}
 
 	defaultElseSyncConfig = syncConfig{
@@ -136,7 +136,7 @@ var (
 		DiscSoftLowCap: 2,
 		DiscHardLowCap: 2,
 		DiscHighCap:    1024,
-		DiscBatch:      2,
+		DiscBatch:      5,
 	}
 )
 

diff --git a/hmy/downloader/downloader.go b/hmy/downloader/downloader.go
@@ -165,7 +165,11 @@ func (d *Downloader) loop() {
 				}()
 				continue
 			}
-			d.logger.Info().Bool("initSync", initSync).Msg("sync finished")
+			d.logger.Info().Int("block added", addedBN).
+				Uint64("current height", d.bc.CurrentBlock().NumberU64()).
+				Bool("initSync", initSync).
+				Uint32("shard", d.bc.ShardID()).
+				Msg("sync finished")
 
 			if addedBN != 0 {
 				// If block number has been changed, trigger another sync

diff --git a/hmy/downloader/shortrange.go b/hmy/downloader/shortrange.go
@@ -57,7 +57,7 @@ func (d *Downloader) doShortRangeSync() (int, error) {
 		sh.removeStreams(whitelist)
 		return n, errors.Wrap(err, "InsertChain")
 	}
-	return n, nil
+	return len(blocks), nil
 }
 
 type srHelper struct {

diff --git a/p2p/stream/protocols/sync/stream.go b/p2p/stream/protocols/sync/stream.go
@@ -55,6 +55,9 @@ func (p *Protocol) wrapStream(raw libp2p_network.Stream) *syncStream {
 }
 
 func (st *syncStream) run() {
+	st.logger.Info().Str("StreamID", string(st.ID())).Msg("running sync protocol on stream")
+	defer st.logger.Info().Str("StreamID", string(st.ID())).Msg("end running sync protocol on stream")
+
 	go st.handleReqLoop()
 	go st.handleRespLoop()
 	st.readMsgLoop()