JAVA-398: Configure max connection retry time

Author: agirbal

src/main/com/mongodb/DBPort.java

@@ -193,6 +193,11 @@ boolean _open()
 
         long sleepTime = 100;
 
+        long maxAutoConnectRetryTime = CONN_RETRY_TIME_MS;
+        if (_options.maxAutoConnectRetryTime > 0) {
+            maxAutoConnectRetryTime = _options.maxAutoConnectRetryTime;
+        }
+
         final long start = System.currentTimeMillis();
         while ( true ){
 
@@ -220,11 +225,11 @@ boolean _open()
 
             long sleptSoFar = System.currentTimeMillis() - start;
 
-            if ( sleptSoFar >= CONN_RETRY_TIME_MS )
+            if ( sleptSoFar >= maxAutoConnectRetryTime )
                 throw lastError;
 
-            if ( sleepTime + sleptSoFar > CONN_RETRY_TIME_MS )
-                sleepTime = CONN_RETRY_TIME_MS - sleptSoFar;
+            if ( sleepTime + sleptSoFar > maxAutoConnectRetryTime )
+                sleepTime = maxAutoConnectRetryTime - sleptSoFar;
 
             _logger.severe( "going to sleep and retry.  total sleep time after = " + ( sleptSoFar + sleptSoFar ) + "ms  this time:" + sleepTime + "ms" );
             ThreadUtil.sleep( sleepTime );

src/main/com/mongodb/MongoOptions.java

@@ -37,6 +37,7 @@ public void reset(){
         socketTimeout = 0;
         socketKeepAlive = false;
         autoConnectRetry = false;
+        maxAutoConnectRetryTime = 0;
         slaveOk = false;
         safe = false;
         w = 0;
@@ -124,6 +125,12 @@ else if (safe)
      */
     public boolean autoConnectRetry;
 
+    /**
+     * The maximum amount of time in MS to spend retrying to open connection to the same server.
+     * Default is 0, which means to use the default 15s if autoConnectRetry is on.
+     */
+    public long maxAutoConnectRetryTime;
+
     /**
      * This flag specifies if the driver is allowed to read from secondary (slave) servers.
      * Specifically in the current implementation, the driver will avoid reading from the primary server and round robin requests to secondaries.
@@ -185,6 +192,7 @@ public String toString(){
         buf.append( "socketTimeout=" ).append( socketTimeout ).append( ", " );
         buf.append( "socketKeepAlive=" ).append( socketKeepAlive ).append( ", " );
         buf.append( "autoConnectRetry=" ).append( autoConnectRetry ).append( ", " );
+        buf.append( "maxAutoConnectRetryTime=" ).append( maxAutoConnectRetryTime ).append( ", " );
         buf.append( "slaveOk=" ).append( slaveOk ).append( ", " );
         buf.append( "safe=" ).append( safe ).append( ", " );
         buf.append( "w=" ).append( w ).append( ", " );