Merge pull request #4996 from wubin01/sync

fix(net): solve 'no need sync' issue reported by nodes

Author: xxo1shine

framework/src/main/java/org/tron/core/net/messagehandler/ChainInventoryMsgHandler.java

@@ -39,6 +39,8 @@ public void processMessage(PeerConnection peer, TronMessage msg) throws P2pExcep
 
     check(peer, chainInventoryMessage);
 
+    peer.setFetchAble(false);
+
     peer.setNeedSyncFromPeer(true);
 
     peer.setSyncChainRequested(null);
@@ -78,10 +80,12 @@ public void processMessage(PeerConnection peer, TronMessage msg) throws P2pExcep
       } catch (NoSuchElementException e) {
         logger.warn("Process ChainInventoryMessage failed, peer {}, isDisconnect:{}",
                 peer.getInetAddress(), peer.isDisconnect());
+        peer.setFetchAble(true);
         return;
       }
     }
 
+    peer.setFetchAble(true);
     if ((chainInventoryMessage.getRemainNum() == 0 && !peer.getSyncBlockToFetch().isEmpty())
         || (chainInventoryMessage.getRemainNum() != 0
         && peer.getSyncBlockToFetch().size() > NetConstants.SYNC_FETCH_BATCH_NUM)) {

framework/src/main/java/org/tron/core/net/peer/PeerConnection.java

@@ -67,6 +67,10 @@ public class PeerConnection {
   @Setter
   private volatile boolean isRelayPeer;
 
+  @Setter
+  @Getter
+  private volatile boolean fetchAble;
+
   @Getter
   @Setter
   private ByteString address;

framework/src/main/java/org/tron/core/net/service/sync/SyncService.java

@@ -207,6 +207,7 @@ private void startFetchSyncBlock() {
     HashMap<PeerConnection, List<BlockId>> send = new HashMap<>();
     tronNetDelegate.getActivePeer().stream()
         .filter(peer -> peer.isNeedSyncFromPeer() && peer.isIdle())
+        .filter(peer -> peer.isFetchAble())
         .forEach(peer -> {
           if (!send.containsKey(peer)) {
             send.put(peer, new LinkedList<>());