set lastactivetime in P2pEventHandlerImpl

Author: 317787106

framework/src/main/java/org/tron/core/net/P2pEventHandlerImpl.java

@@ -19,6 +19,7 @@
 import org.tron.core.net.message.PbftMessageFactory;
 import org.tron.core.net.message.TronMessage;
 import org.tron.core.net.message.TronMessageFactory;
+import org.tron.core.net.message.adv.FetchInvDataMessage;
 import org.tron.core.net.message.adv.InventoryMessage;
 import org.tron.core.net.message.base.DisconnectMessage;
 import org.tron.core.net.message.handshake.HelloMessage;
@@ -38,6 +39,7 @@
 import org.tron.p2p.P2pEventHandler;
 import org.tron.p2p.connection.Channel;
 import org.tron.protos.Protocol;
+import org.tron.protos.Protocol.Inventory.InventoryType;
 import org.tron.protos.Protocol.ReasonCode;
 
 @Slf4j(topic = "net")
@@ -183,9 +185,11 @@ private void processMessage(PeerConnection peer, byte[] data) {
           break;
         case SYNC_BLOCK_CHAIN:
           syncBlockChainMsgHandler.processMessage(peer, msg);
+          peer.setLastActiveTime(System.currentTimeMillis());
           break;
         case BLOCK_CHAIN_INVENTORY:
           chainInventoryMsgHandler.processMessage(peer, msg);
+          peer.setLastActiveTime(System.currentTimeMillis());
           break;
         case INVENTORY:
           inventoryMsgHandler.processMessage(peer, msg);
@@ -195,6 +199,7 @@ private void processMessage(PeerConnection peer, byte[] data) {
           break;
         case BLOCK:
           blockMsgHandler.processMessage(peer, msg);
+          peer.setLastActiveTime(System.currentTimeMillis());
           break;
         case TRXS:
           transactionsMsgHandler.processMessage(peer, msg);

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

@@ -76,7 +76,6 @@ public void processMessage(PeerConnection peer, TronMessage msg) throws P2pExcep
     if (!fastForward && !peer.isRelayPeer()) {
       check(peer, blockMessage);
     }
-    peer.setLastActiveTime(System.currentTimeMillis());
 
     if (peer.getSyncBlockRequested().containsKey(blockId)) {
       peer.getSyncBlockRequested().remove(blockId);

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

@@ -142,7 +142,6 @@ private void check(PeerConnection peer, ChainInventoryMessage msg) throws P2pExc
             + msg.getRemainNum() + " > futureMaxNum: " + maxFutureNum);
       }
     }
-    peer.setLastActiveTime(System.currentTimeMillis());
   }
 
 }

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

@@ -33,7 +33,6 @@ public void processMessage(PeerConnection peer, TronMessage msg) throws P2pExcep
       peer.disconnect(Protocol.ReasonCode.BAD_PROTOCOL);
       return;
     }
-    peer.setLastActiveTime(System.currentTimeMillis());
     long remainNum = 0;
 
     List<BlockId> summaryChainIds = syncBlockChainMessage.getBlockIds();

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

@@ -81,7 +81,7 @@ public class PeerConnection {
 
   @Getter
   @Setter
-  private long lastActiveTime;
+  private volatile long lastActiveTime;
 
   @Getter
   @Setter

framework/src/main/java/org/tron/core/net/service/effective/ResilienceService.java

@@ -22,26 +22,24 @@
 @Component
 public class ResilienceService {
 
-  private final long inactiveThreshold =
+  private static final long inactiveThreshold =
       CommonParameter.getInstance().getInactiveThreshold() * 1000L;
   public static final long blockNotChangeThreshold = 90 * 1000L;
 
   //when node is isolated, retention percent peers will not be disconnected
   public static final double retentionPercent = 0.8;
   private static final int initialDelay = 300;
-  private final String esName = "resilience-service";
+  private static final String esName = "resilience-service";
+  private final ScheduledExecutorService executor = ExecutorServiceManager
+      .newSingleThreadScheduledExecutor(esName);
 
   @Autowired
   private TronNetDelegate tronNetDelegate;
 
   @Autowired
   private ChainBaseManager chainBaseManager;
 
-  private ScheduledExecutorService executor;
-
   public void init() {
-    executor = ExecutorServiceManager.newSingleThreadScheduledExecutor(esName);
-
     if (Args.getInstance().isOpenFullTcpDisconnect) {
       executor.scheduleWithFixedDelay(() -> {
         try {

framework/src/main/resources/config-localtest.conf

@@ -99,7 +99,7 @@ node {
 
   # check the peer data transfer ,disconnect factor
   isOpenFullTcpDisconnect = true
-  inactiveThreshold = 600
+  inactiveThreshold = 600 //seconds
 
   p2p {
     version = 333 # 11111: mainnet; 20180622: testnet

framework/src/main/resources/config.conf

@@ -180,7 +180,7 @@ node {
   minParticipationRate = 15
 
   isOpenFullTcpDisconnect = false
-  inactiveThreshold = 600
+  inactiveThreshold = 600 //seconds
 
   p2p {
     version = 11111 # 11111: mainnet; 20180622: testnet

framework/src/test/resources/args-test.conf

@@ -92,7 +92,7 @@ node {
   maxConnections = 30
   minConnections = 8
   minActiveConnections = 3
-  inactiveThreshold = 600
+  inactiveThreshold = 600 //seconds
 
   p2p {
     version = 43 # 43: testnet; 101: debug

framework/src/test/resources/config-localtest.conf

@@ -96,7 +96,7 @@ node {
 
   # check the peer data transfer ,disconnect factor
   isOpenFullTcpDisconnect = true
-  inactiveThreshold = 600
+  inactiveThreshold = 600 //seconds
 
   p2p {
     version = 333 # 11111: mainnet; 20180622: testnet