Merge branch 'tronprotocol:develop' into develop

Author: 317787106

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

@@ -104,14 +104,20 @@ private void check(PeerConnection peer, BlockMessage msg) throws P2pException {
     Item item = new Item(msg.getBlockId(), InventoryType.BLOCK);
     if (!peer.getSyncBlockRequested().containsKey(msg.getBlockId()) && !peer.getAdvInvRequest()
             .containsKey(item)) {
+      logger.error("Receive bad block {} from peer {}, with no request",
+              msg.getBlockId(), peer.getInetSocketAddress());
       throw new P2pException(TypeEnum.BAD_MESSAGE, "no request");
     }
     BlockCapsule blockCapsule = msg.getBlockCapsule();
     if (blockCapsule.getInstance().getSerializedSize() > maxBlockSize) {
+      logger.error("Receive bad block {} from peer {}, block size over limit",
+              msg.getBlockId(), peer.getInetSocketAddress());
       throw new P2pException(TypeEnum.BAD_MESSAGE, "block size over limit");
     }
     long gap = blockCapsule.getTimeStamp() - System.currentTimeMillis();
     if (gap >= BLOCK_PRODUCED_INTERVAL) {
+      logger.error("Receive bad block {} from peer {}, block time error",
+              msg.getBlockId(), peer.getInetSocketAddress());
       throw new P2pException(TypeEnum.BAD_MESSAGE, "block time error");
     }
   }

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

@@ -7,6 +7,7 @@
 import java.net.InetSocketAddress;
 import java.util.Deque;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -28,6 +29,7 @@
 import org.tron.core.Constant;
 import org.tron.core.capsule.BlockCapsule.BlockId;
 import org.tron.core.config.Parameter.NetConstants;
+import org.tron.core.config.args.Args;
 import org.tron.core.metrics.MetricsKey;
 import org.tron.core.metrics.MetricsUtil;
 import org.tron.core.net.TronNetDelegate;
@@ -50,6 +52,8 @@
 @Scope("prototype")
 public class PeerConnection {
 
+  private static List<InetSocketAddress> relayNodes = Args.getInstance().getFastForwardNodes();
+
   @Getter
   private PeerStatistics peerStatistics = new PeerStatistics();
 
@@ -61,7 +65,7 @@ public class PeerConnection {
 
   @Getter
   @Setter
-  private boolean isRelayPeer;
+  private volatile boolean isRelayPeer;
 
   @Getter
   @Setter
@@ -143,6 +147,9 @@ public class PeerConnection {
 
   public void setChannel(Channel channel) {
     this.channel = channel;
+    if (relayNodes.contains(channel.getInetSocketAddress())) {
+      this.isRelayPeer = true;
+    }
     this.nodeStatistics = TronStatsManager.getNodeStatistics(channel.getInetAddress());
   }
 

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

@@ -53,11 +53,17 @@ public void statusCheck() {
       if (!isDisconnected) {
         isDisconnected = peer.getAdvInvRequest().values().stream()
             .anyMatch(time -> time < now - NetConstants.ADV_TIME_OUT);
+        if (isDisconnected) {
+          logger.warn("Peer {} get avd message timeout", peer.getInetAddress());
+        }
       }
 
       if (!isDisconnected) {
         isDisconnected = peer.getSyncBlockRequested().values().stream()
             .anyMatch(time -> time < now - NetConstants.SYNC_TIME_OUT);
+        if (isDisconnected) {
+          logger.warn("Peer {} get sync message timeout", peer.getInetAddress());
+        }
       }
 
       if (isDisconnected) {

framework/src/main/java/org/tron/core/net/service/keepalive/KeepAliveService.java

@@ -35,6 +35,7 @@ public void init() {
           long lastSendTime = p.getChannel().getLastSendTime();
           if (p.getChannel().waitForPong) {
             if (now - pingSent > PING_TIMEOUT) {
+              logger.warn("Peer {} receive pong timeout", p.getInetSocketAddress());
               p.disconnect(Protocol.ReasonCode.TIME_OUT);
             }
           } else {