Merge pull request #5234 from chengtx01/optimize_sync

fix(net):optimize sync service
tronprotocol · May 24, 2023 · ad1a1b3 · ad1a1b3
2 parents dcf8982 + c8b9d1a
commit ad1a1b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/framework/src/main/java/org/tron/core/net/messagehandler/BlockMsgHandler.java b/framework/src/main/java/org/tron/core/net/messagehandler/BlockMsgHandler.java
@@ -67,6 +67,7 @@ public void processMessage(PeerConnection peer, TronMessage msg) throws P2pExcep
 
     if (peer.getSyncBlockRequested().containsKey(blockId)) {
       peer.getSyncBlockRequested().remove(blockId);
+      peer.getSyncBlockInProcess().add(blockId);
       syncService.processBlock(peer, blockMessage);
     } else {
       Item item = new Item(blockId, InventoryType.BLOCK);

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
@@ -225,7 +225,8 @@ private void startFetchSyncBlock() {
             send.put(peer, new LinkedList<>());
           }
           for (BlockId blockId : peer.getSyncBlockToFetch()) {
-            if (requestBlockIds.getIfPresent(blockId) == null) {
+            if (requestBlockIds.getIfPresent(blockId) == null
+                && !peer.getSyncBlockInProcess().contains(blockId)) {
               requestBlockIds.put(blockId, peer);
               peer.getSyncBlockRequested().put(blockId, System.currentTimeMillis());
               send.get(peer).add(blockId);
@@ -266,6 +267,7 @@ private synchronized void handleSyncBlock() {
           }
           if (msg.getBlockId().getNum() <= solidNum) {
             blockWaitToProcess.remove(msg);
+            peerConnection.getSyncBlockInProcess().remove(msg.getBlockId());
             return;
           }
           final boolean[] isFound = {false};
@@ -278,6 +280,7 @@ private synchronized void handleSyncBlock() {
             blockWaitToProcess.remove(msg);
             isProcessed[0] = true;
             processSyncBlock(msg.getBlockCapsule(), peerConnection);
+            peerConnection.getSyncBlockInProcess().remove(msg.getBlockId());
           }
         }
       });