Merge pull request #5102 from wubin01/sync_block_process_opt

xxo1shine · web-flow · commit fee70c271950 · 2023-03-30T18:09:29.000+08:00
feat(net): optimize processSyncBlock function logic
diff --git a/framework/src/main/java/org/tron/core/net/service/sync/SyncService.java b/framework/src/main/java/org/tron/core/net/service/sync/SyncService.java
@@ -292,7 +292,7 @@ private void processSyncBlock(BlockCapsule block) {
       if (peer.getSyncBlockInProcess().remove(blockId)) {
         if (flag) {
           peer.setBlockBothHave(blockId);
-          if (peer.getSyncBlockToFetch().isEmpty()) {
+          if (peer.getSyncBlockToFetch().isEmpty() && !peer.isFetchAble()) {
             syncNext(peer);
           }
         } else {

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ private void processSyncBlock(BlockCapsule block) {`
`292`	`292`	`if (peer.getSyncBlockInProcess().remove(blockId)) {`
`293`	`293`	`if (flag) {`
`294`	`294`	`peer.setBlockBothHave(blockId);`
`295`		`- if (peer.getSyncBlockToFetch().isEmpty()) {`
	`295`	`+ if (peer.getSyncBlockToFetch().isEmpty() && !peer.isFetchAble()) {`
`296`	`296`	`syncNext(peer);`
`297`	`297`	`}`
`298`	`298`	`} else {`