SERVER-12910 release conns back to pool after every mongos operation

1 files changed, 3 insertions, 6 deletions

diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index 507868912f3..620e6cc5374 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -141,12 +141,6 @@ namespace mongo {
             try {
                 r.init();
                 r.process();
-
-                // Release connections after non-write op 
-                if ( r.expectResponse() ) {
-                    LOG(2) << "release thread local connections back to pool" << endl;
-                    ShardConnection::releaseMyConnections();
-                }
             }
             catch ( const AssertionException& ex ) {
 
@@ -176,6 +170,9 @@ namespace mongo {
                 // We *always* populate the last error for now
                 le->raiseError( ex.getCode() , ex.what() );
             }
+
+            // Release connections back to pool, if any still cached
+            ShardConnection::releaseMyConnections();
         }
 
         virtual void disconnected( AbstractMessagingPort* p ) {