[JAVA-315]: several exception cases do not put back the dbport in pool, resulting in forever hanging pool to that server

agirbal · agirbal · commit 143dce3ecbfd · 2011-03-31T15:46:43.000-07:00
[JAVA-316]: in DBTCPConnector.say(), possible race condition that affects getLastError() result
diff --git a/src/main/com/mongodb/DBTCPConnector.java b/src/main/com/mongodb/DBTCPConnector.java
@@ -117,14 +117,9 @@ void _checkClosed(){
     }
 
     WriteResult _checkWriteError( DB db , MyPort mp , DBPort port , WriteConcern concern )
-        throws MongoException {
+        throws MongoException, IOException {
         CommandResult e = null;
-        try {
-            e = port.runCommand( db , concern.getCommand() );
-        } catch ( IOException ioe ){
-            throw new MongoException.Network( ioe.getMessage() , ioe );
-        }
-        mp.done( port );
+        e = port.runCommand( db , concern.getCommand() );
         
         Object foo = e.get( "err" );
         if ( foo == null )
@@ -162,7 +157,6 @@ public WriteResult say( DB db , OutMessage m , WriteConcern concern , ServerAddr
                 return _checkWriteError( db , mp , port , concern );
             }
             else {
-                mp.done( port );
                 return new WriteResult( db , port , concern );
             }
         }
@@ -186,6 +180,7 @@ public WriteResult say( DB db , OutMessage m , WriteConcern concern , ServerAddr
             throw re;
         }
         finally {
+            mp.done( port );
             m.doneWithMessage();
         }
     }
@@ -210,26 +205,30 @@ public Response call( DB db , DBCollection coll , OutMessage m , ServerAddress h
         final DBPort port = mp.get( false , slaveOk, hostNeeded );
                 
         Response res = null;
+        boolean retry = false;
         try {
             port.checkAuth( db );
             res = port.call( m , coll );
-            mp.done( port );
             if ( res._responseTo != m.getId() )
                 throw new MongoException( "ids don't match" );
         }
         catch ( IOException ioe ){
-            boolean shouldRetry = _error( ioe, slaveOk ) && ! coll._name.equals( "$cmd" ) && retries > 0;
             mp.error( port , ioe );
-            if ( shouldRetry ){
-                return call( db , coll , m , hostNeeded , retries - 1 );
+            retry = _error( ioe, slaveOk ) && ! coll._name.equals( "$cmd" ) && retries > 0;
+            if ( !retry ){
+                throw new MongoException.Network( "can't call something" , ioe );
             }
-            throw new MongoException.Network( "can't call something" , ioe );
         }
         catch ( RuntimeException re ){
             mp.error( port , re );
             throw re;
+        } finally {
+            mp.done( port );
         }
-        
+
+        if (retry)
+            return call( db , coll , m , hostNeeded , retries - 1 );
+
         ServerError err = res.getError();
         
         if ( err != null && err.isNotMasterError() ){
@@ -356,8 +355,6 @@ void done( DBPort p ){
          */
         void error( DBPort p , Exception e ){
             p.close();
-            p.getPool().done( p );
-
             _requestPort = null;
             _logger.log( Level.SEVERE , "MyPort.error called" , e );            
         }
