AJ-712: add 'tryReconnectNums' for pool;

Author: chengyitian

src/com/xxdb/DBConnection.java

@@ -726,9 +726,12 @@ public boolean connect(String hostName, int port, String userId, String password
     }
 
     public boolean connect(String hostName, int port, String userId, String password, String initialScript, boolean enableHighAvailability, String[] highAvailabilitySites, boolean reconnect, boolean enableLoadBalance, int tryReconnectNums) throws IOException {
-        if (tryReconnectNums < 0)
-            throw new RuntimeException("The param 'tryReconnectNums' cannot less than 0.");
-        this.tryReconnectNums = tryReconnectNums;
+        if (tryReconnectNums <= 0) {
+            this.tryReconnectNums = -1;
+            log.warn("If the param 'tryReconnectNums' less than or equal to 0, when reconnect will be unlimited attempts.");
+        } else {
+            this.tryReconnectNums = tryReconnectNums;
+        }
 
         return connect(hostName, port, userId, password, initialScript, enableHighAvailability, highAvailabilitySites, reconnect, enableLoadBalance);
     }

src/com/xxdb/SimpleDBConnectionPool.java

@@ -33,6 +33,8 @@ public class SimpleDBConnectionPool {
     private boolean enableHighAvailability;
     private String[] highAvailabilitySites;
     private boolean reconnect = true;
+    private int tryReconnectNums;
+
     private static final Logger log = LoggerFactory.getLogger(DBConnection.class);
 
     private final Queue<PoolEntry> poolEntries = new ConcurrentLinkedQueue<>();
@@ -57,6 +59,7 @@ public SimpleDBConnectionPool(SimpleDBConnectionPoolConfig simpleDBConnectionPoo
         this.loadBalance = simpleDBConnectionPoolConfig.isLoadBalance();
         this.enableHighAvailability = simpleDBConnectionPoolConfig.isEnableHighAvailability();
         this.highAvailabilitySites = simpleDBConnectionPoolConfig.getHighAvailabilitySites();
+        this.tryReconnectNums = simpleDBConnectionPoolConfig.getTryReconnectNums();
 
         initPool();
     }
@@ -65,7 +68,7 @@ private void initPool() {
         for (int i = 0; i < minimumPoolSize; i++) {
             try {
                 PoolEntry poolEntry = new PoolEntry(useSSL, compress, usePython, String.format("DolphinDBConnection_%d", i + 1));
-                if (poolEntry.entryConnect(hostName, port, userId, password, initialScript, enableHighAvailability, highAvailabilitySites, reconnect, loadBalance)) {
+                if (poolEntry.entryConnect(hostName, port, userId, password, initialScript, enableHighAvailability, highAvailabilitySites, reconnect, loadBalance, tryReconnectNums)) {
                     poolEntries.add(poolEntry);
                 } else {
                     throw new RuntimeException(String.format("Connection %s connect failure.", poolEntry.connectionName));
@@ -109,7 +112,7 @@ public DBConnection getConnection() {
             if (poolEntries.size() < maximumPoolSize) {
                 try {
                     PoolEntry poolEntry = new PoolEntry(useSSL, compress, usePython, String.format("DolphinDBConnection_%d", poolEntries.size() + 1));
-                    if (poolEntry.entryConnect(hostName, port, userId, password, initialScript, enableHighAvailability, highAvailabilitySites, reconnect, loadBalance)) {
+                    if (poolEntry.entryConnect(hostName, port, userId, password, initialScript, enableHighAvailability, highAvailabilitySites, reconnect, loadBalance, tryReconnectNums)) {
                         poolEntries.add(poolEntry);
                         if (poolEntry.inUse.compareAndSet(false, true)) {
                             return poolEntry;
@@ -216,8 +219,8 @@ class PoolEntry extends DBConnection {
             this.connectionName = connectionName;
         }
 
-        private boolean entryConnect(String hostName, int port, String userId, String password, String initialScript, boolean enableHighAvailability, String[] highAvailabilitySites, boolean reconnect, boolean enableLoadBalance) throws IOException {
-            boolean isConnected = super.connect(hostName, port, userId, password, initialScript, enableHighAvailability, highAvailabilitySites, reconnect, enableLoadBalance);
+        private boolean entryConnect(String hostName, int port, String userId, String password, String initialScript, boolean enableHighAvailability, String[] highAvailabilitySites, boolean reconnect, boolean enableLoadBalance, int tryReconnectNums) throws IOException {
+            boolean isConnected = super.connect(hostName, port, userId, password, initialScript, enableHighAvailability, highAvailabilitySites, reconnect, enableLoadBalance, tryReconnectNums);
             if (isConnected) {
                 this.lastUsedTime = System.currentTimeMillis();
             }

src/com/xxdb/SimpleDBConnectionPoolConfig.java

@@ -26,6 +26,7 @@ public class SimpleDBConnectionPoolConfig {
     private boolean loadBalance = false;
     private boolean enableHighAvailability = false;
     private String[] highAvailabilitySites = null;
+    private int tryReconnectNums = -1;
 
     private static final Logger log = LoggerFactory.getLogger(DBConnection.class);
 
@@ -162,6 +163,14 @@ public void setHighAvailabilitySites(String[] highAvailabilitySites) {
         this.highAvailabilitySites = highAvailabilitySites;
     }
 
+    public void setTryReconnectNums(int tryReconnectNums) {
+        this.tryReconnectNums = tryReconnectNums;
+    }
+
+    public int getTryReconnectNums() {
+        return tryReconnectNums;
+    }
+
     /**
      * add param check when pool init start.
      */