Merge pull request tronprotocol#1149 from tronprotocol/modify-net-connect

wubin12 · web-flow · commit 43f9d5d30d82 · 2018-07-12T11:28:35.000+08:00
optimization the net connect
diff --git a/src/main/java/org/tron/common/overlay/server/HandshakeHandler.java b/src/main/java/org/tron/common/overlay/server/HandshakeHandler.java
@@ -57,7 +57,7 @@ public class HandshakeHandler extends ByteToMessageDecoder {
   private Manager manager;
 
   private  P2pMessageFactory messageFactory = new P2pMessageFactory();
-  
+
   @Autowired
   private SyncPool syncPool;
 
diff --git a/src/main/java/org/tron/common/overlay/server/SyncPool.java b/src/main/java/org/tron/common/overlay/server/SyncPool.java
@@ -51,16 +51,16 @@ public class SyncPool {
 
   public static final Logger logger = LoggerFactory.getLogger("SyncPool");
 
-  private static final double factor = 0.4;
-  private static final double activeFactor = 0.2;
+  private double factor = Args.getInstance().getConnectFactor();
+  private double activeFactor = Args.getInstance().getActiveConnectFactor();
 
   private final List<PeerConnection> activePeers = Collections
       .synchronizedList(new ArrayList<PeerConnection>());
   private final AtomicInteger passivePeersCount = new AtomicInteger(0);
   private final AtomicInteger activePeersCount = new AtomicInteger(0);
 
   private Cache<NodeHandler, Long> nodeHandlerCache = CacheBuilder.newBuilder()
-      .maximumSize(1000).expireAfterWrite(120, TimeUnit.SECONDS).recordStats().build();
+      .maximumSize(1000).expireAfterWrite(180, TimeUnit.SECONDS).recordStats().build();
 
   @Autowired
   private NodeManager nodeManager;
@@ -101,7 +101,7 @@ public void init(PeerConnectionDelegate peerDel) {
       } catch (Throwable t) {
         logger.error("Exception in sync worker", t);
       }
-    }, 30, 16, TimeUnit.SECONDS);
+    }, 30, 3600, TimeUnit.MILLISECONDS);
 
     logExecutor.scheduleWithFixedDelay(() -> {
       try {
diff --git a/src/main/java/org/tron/core/config/args/Args.java b/src/main/java/org/tron/core/config/args/Args.java
@@ -257,6 +257,14 @@ public class Args {
   @Setter
   private List<String> backupMembers;
 
+  @Getter
+  @Setter
+  private double connectFactor;
+
+  @Getter
+  @Setter
+  private double activeConnectFactor;
+
   public static void clearParam() {
     INSTANCE.outputDirectory = "output-directory";
     INSTANCE.help = false;
@@ -305,6 +313,8 @@ public static void clearParam() {
     INSTANCE.solidityNode = false;
     INSTANCE.trustNodeAddr = "";
     INSTANCE.walletExtensionApi = false;
+    INSTANCE.connectFactor = 0.3;
+    INSTANCE.activeConnectFactor = 0.1;
   }
 
   /**
@@ -511,6 +521,12 @@ public static void setParam(final String[] args, final String confFileName) {
     INSTANCE.walletExtensionApi =
         config.hasPath("node.walletExtensionApi") && config.getBoolean("node.walletExtensionApi");
 
+    INSTANCE.connectFactor =
+        config.hasPath("node.connectFactor") ? config.getDouble("node.connectFactor") : 0.3;
+
+    INSTANCE.activeConnectFactor = config.hasPath("node.activeConnectFactor") ?
+        config.getDouble("node.activeConnectFactor") : 0.1;
+
     initBackupProperty(config);
 
     logConfig();
diff --git a/src/main/resources/config.conf b/src/main/resources/config.conf
@@ -81,6 +81,9 @@ node {
   # Number of validate sign thread, default availableProcessors / 2
   # validateSignThreadNum = 16
 
+  connectFactor = 0.3
+  activeConnectFactor = 0.1
+
   maxActiveNodes = 30
 
   maxActiveNodesWithSameIp = 2
