SERVER-9041 proactively detect background conn failures in conn pools

1 files changed, 4 insertions, 3 deletions

diff --git a/src/mongo/client/connpool.cpp b/src/mongo/client/connpool.cpp
index 740249d87bb..36cd5919e85 100644
--- a/src/mongo/client/connpool.cpp
+++ b/src/mongo/client/connpool.cpp
@@ -61,7 +61,8 @@ namespace mongo {
                 microSec > _minValidCreationTimeMicroSec) {
             _minValidCreationTimeMicroSec = microSec;
             log() << "Detected bad connection created at " << _minValidCreationTimeMicroSec
-                    << " microSec, clearing pool for " << _hostName << endl;
+                    << " microSec, clearing pool for " << _hostName
+                    << " of " << _pool.size() << " connections" << endl;
             clear();
         }
     }
@@ -148,8 +149,8 @@ namespace mongo {
     }
 
     bool PoolForHost::StoredConnection::ok( time_t now ) {
-        // if connection has been idle for 30 minutes, kill it
-        return ( now - when ) < 1800;
+        // Poke the connection to see if we're still ok
+        return conn->isStillConnected();
     }
 
     void PoolForHost::createdOne( DBClientBase * base) {