SERVER-36468 Add a mechanism to allow breaking DBClientConnection out of a blocking operation

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mongo/client/connection_pool.cpp b/src/mongo/client/connection_pool.cpp
index c02ab68ed5d..703099e746e 100644
--- a/src/mongo/client/connection_pool.cpp
+++ b/src/mongo/client/connection_pool.cpp
@@ -92,20 +92,20 @@ void ConnectionPool::_cleanUpOlderThan_inlock(Date_t now, ConnectionList* hostCo
     }
 }
 
-bool ConnectionPool::_shouldKeepConnection(Date_t now, const ConnectionInfo& connInfo) const {
+bool ConnectionPool::_shouldKeepConnection(Date_t now, const ConnectionInfo& connInfo) {
     const Date_t expirationDate = connInfo.creationDate + kMaxConnectionAge;
     if (expirationDate <= now) {
         return false;
     }
 
-    return true;
+    return !connInfo.conn->isFailed();
 }
 
 void ConnectionPool::closeAllInUseConnections() {
     stdx::lock_guard<stdx::mutex> lk(_mutex);
     for (ConnectionList::iterator iter = _inUseConnections.begin(); iter != _inUseConnections.end();
          ++iter) {
-        iter->conn->shutdown();
+        iter->conn->shutdownAndDisallowReconnect();
     }
 }