Merge pull request #5094 from chengtx01/fix_no_request

fix(net):fix block fetching issue in FetchBlockService

Author: jwrct

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

@@ -293,6 +293,14 @@ public static boolean needToLog(Message msg) {
     return true;
   }
 
+  public synchronized boolean checkAndPutAdvInvRequest(Item key, Long value) {
+    if (advInvRequest.containsKey(key)) {
+      return false;
+    }
+    advInvRequest.put(key, value);
+    return true;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (!(o instanceof PeerConnection)) {

framework/src/main/java/org/tron/core/net/service/adv/AdvService.java

@@ -281,8 +281,9 @@ private void consumerInvToFetch() {
                 && invSender.getSize(peer) < MAX_TRX_FETCH_PER_PEER)
                 .sorted(Comparator.comparingInt(peer -> invSender.getSize(peer)))
                 .findFirst().ifPresent(peer -> {
-                  invSender.add(item, peer);
-                  peer.getAdvInvRequest().put(item, now);
+                  if (peer.checkAndPutAdvInvRequest(item, now)) {
+                    invSender.add(item, peer);
+                  }
                   invToFetch.remove(item);
                 });
       });

framework/src/main/java/org/tron/core/net/service/fetchblock/FetchBlockService.java

@@ -117,8 +117,8 @@ private void fetchBlockProcess(FetchBlockInfo fetchBlock) {
 
     if (optionalPeerConnection.isPresent()) {
       optionalPeerConnection.ifPresent(firstPeer -> {
-        if (shouldFetchBlock(firstPeer, fetchBlock)) {
-          firstPeer.getAdvInvRequest().put(item, System.currentTimeMillis());
+        if (shouldFetchBlock(firstPeer, fetchBlock)
+            && firstPeer.checkAndPutAdvInvRequest(item, System.currentTimeMillis())) {
           firstPeer.sendMessage(new FetchInvDataMessage(Collections.singletonList(item.getHash()),
               item.getType()));
           this.fetchBlockInfo = null;

framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java

@@ -85,6 +85,7 @@ private void testBroadcast() {
 
     try {
       peer = context.getBean(PeerConnection.class);
+      Assert.assertFalse(peer.isDisconnect());
       p2pEventHandler = context.getBean(P2pEventHandlerImpl.class);
 
       List<PeerConnection> peers = Lists.newArrayList();
@@ -96,6 +97,9 @@ private void testBroadcast() {
       service.broadcast(msg);
       Item item = new Item(blockCapsule.getBlockId(), InventoryType.BLOCK);
       Assert.assertNotNull(service.getMessage(item));
+      peer.checkAndPutAdvInvRequest(item, System.currentTimeMillis());
+      boolean res = peer.checkAndPutAdvInvRequest(item, System.currentTimeMillis());
+      Assert.assertFalse(res);
     } catch (NullPointerException e) {
       System.out.println(e);
     }