Merge pull request tronprotocol#2708 from tomos01/keepAliveInterval_configurable

keepAliveInterval configurable

Author: xxo1shine

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -319,6 +319,10 @@ public class CommonParameter {
   @Setter
   public int backupPort;
 
+  @Getter
+  @Setter
+  public int keepAliveInterval;
+
   @Getter
   @Setter
   public List<String> backupMembers;

common/src/main/java/org/tron/core/Constant.java

@@ -217,6 +217,7 @@ public class Constant {
 
   public static final String NODE_BACKUP_PRIORITY = "node.backup.priority";
   public static final String NODE_BACKUP_PORT = "node.backup.port";
+  public static final String NODE_BACKUP_KEEPALIVEINTERVAL = "node.backup.keepAliveInterval";
   public static final String NODE_BACKUP_MEMBERS = "node.backup.members";
 
   public static final String STORAGE_BACKUP_ENABLE = "storage.backup.enable";

framework/src/main/java/org/tron/common/backup/BackupManager.java

@@ -31,6 +31,10 @@ public class BackupManager implements EventHandler {
 
   private int port = parameter.getBackupPort();
 
+  private int keepAliveInterval = parameter.getKeepAliveInterval();
+
+  private int keepAliveTimeout = keepAliveInterval * 6;
+
   private String localIp = "";
 
   private Set<String> members = new ConcurrentSet<>();
@@ -43,8 +47,6 @@ public class BackupManager implements EventHandler {
 
   private volatile long lastKeepAliveTime;
 
-  private volatile long keepAliveTimeout = 10_000;
-
   private volatile boolean isInit = false;
 
   public void setMessageHandler(MessageHandler messageHandler) {
@@ -105,7 +107,7 @@ public void init() {
       } catch (Throwable t) {
         logger.error("Exception in send keep alive message:{}", t.getMessage());
       }
-    }, 1, 1, TimeUnit.SECONDS);
+    }, 1000, keepAliveInterval, TimeUnit.MILLISECONDS);
   }
 
   @Override

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -921,13 +921,18 @@ private static void initRocksDbBackupProperty(Config config) {
   private static void initBackupProperty(Config config) {
     PARAMETER.backupPriority = config.hasPath(Constant.NODE_BACKUP_PRIORITY)
         ? config.getInt(Constant.NODE_BACKUP_PRIORITY) : 0;
+
     PARAMETER.backupPort = config.hasPath(Constant.NODE_BACKUP_PORT)
         ? config.getInt(Constant.NODE_BACKUP_PORT) : 10001;
+
+    PARAMETER.keepAliveInterval = config.hasPath(Constant.NODE_BACKUP_KEEPALIVEINTERVAL)
+        ? config.getInt(Constant.NODE_BACKUP_KEEPALIVEINTERVAL) : 3000;
+
     PARAMETER.backupMembers = config.hasPath(Constant.NODE_BACKUP_MEMBERS)
         ? config.getStringList(Constant.NODE_BACKUP_MEMBERS) : new ArrayList<>();
   }
 
-  private static void logConfig() {
+  public static void logConfig() {
     CommonParameter parameter = CommonParameter.getInstance();
     logger.info("\n");
     logger.info("************************ Net config ************************");
@@ -944,9 +949,10 @@ private static void logConfig() {
     logger.info("Max connection with same IP: {}", parameter.getNodeMaxActiveNodesWithSameIp());
     logger.info("Solidity threads: {}", parameter.getSolidityThreads());
     logger.info("************************ Backup config ************************");
+    logger.info("Backup priority: {}", parameter.getBackupPriority());
     logger.info("Backup listen port: {}", parameter.getBackupPort());
+    logger.info("Backup listen keepAliveInterval: {}", parameter.getKeepAliveInterval());
     logger.info("Backup member size: {}", parameter.getBackupMembers().size());
-    logger.info("Backup priority: {}", parameter.getBackupPriority());
     logger.info("************************ Code version *************************");
     logger.info("Code version : {}", Version.getVersion());
     logger.info("Version name: {}", Version.versionName);

framework/src/main/resources/config.conf

@@ -82,11 +82,15 @@ node.discovery = {
 }
 
 node.backup {
-  port = 10001
-
   # my priority, each member should use different priority
   priority = 8
 
+  # udp listen port, each member should have the save configuration
+  port = 10001
+
+  # time interval to send keepAlive message, each member should have the save configuration
+  keepAliveInterval = 3000
+
   # peer's ip list, can't contain mine
   members = [
     # "ip",

framework/src/test/java/org/tron/core/config/args/ArgsTest.java

@@ -40,6 +40,15 @@ public void get() {
     Args.setParam(new String[]{"-w"}, Constant.TEST_CONF);
 
     CommonParameter parameter = Args.getInstance();
+
+    Args.logConfig();
+
+    Assert.assertEquals(0, parameter.getBackupPriority());
+
+    Assert.assertEquals(3000, parameter.getKeepAliveInterval());
+
+    Assert.assertEquals(10001, parameter.getBackupPort());
+
     Assert.assertEquals("database", parameter.getStorage().getDbDirectory());
 
     Assert.assertEquals(11, parameter.getSeedNode().getIpList().size());