diff options
| author | Greg Studer <greg@10gen.com> | 2013-03-18 10:28:44 -0400 |
|---|---|---|
| committer | Greg Studer <greg@10gen.com> | 2013-03-18 11:33:33 -0400 |
| commit | ed9d5f067faadc0bcaeed184f47657741b30f59d (patch) | |
| tree | 358d8bef2e472cd8eda81f1ae4bd6bd8e1d63bad | |
| parent | 4873c2bd64b71af9713eb75b222a7e13c6c4e747 (diff) | |
| download | mongo-ed9d5f067faadc0bcaeed184f47657741b30f59d.tar.gz | |
Revert "Revert "SERVER-8648 add explicit timeout to checkStatus connection""
also SERVER-8940 buildbot remove2.js flush pool manually before retrying query
| -rw-r--r-- | jstests/sharding/remove2.js | 5 | ||||
| -rw-r--r-- | src/mongo/client/dbclient_rs.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/jstests/sharding/remove2.js b/jstests/sharding/remove2.js index daa5077431c..556f4c9200d 100644 --- a/jstests/sharding/remove2.js +++ b/jstests/sharding/remove2.js @@ -61,6 +61,11 @@ addShard = function(st, replTest) { return x < 2; } , "no balance happened", 60000 ); + // NOTE: To avoid getMore problems stranding cursors b/c of our current conn + // pool behavior, this needs to be run. + // TODO: Remove once conn pooling behavior is better + printjson( coll.getMongo().getDB("admin").runCommand({ connPoolSync : true }) ); + try { assert.eq( 300, coll.find().itcount() ); } catch (e) { diff --git a/src/mongo/client/dbclient_rs.cpp b/src/mongo/client/dbclient_rs.cpp index f98c8d852b5..446e876efd0 100644 --- a/src/mongo/client/dbclient_rs.cpp +++ b/src/mongo/client/dbclient_rs.cpp @@ -510,7 +510,7 @@ namespace mongo { * and tell it to use the internal credentials. */ scoped_ptr<ScopedDbConnection> authenticatedConn( - ScopedDbConnection::getInternalScopedDbConnection( hostAddr ) ); + ScopedDbConnection::getInternalScopedDbConnection( hostAddr, 5.0 ) ); if ( !authenticatedConn->get()->runCommand( "admin", BSON( "replSetGetStatus" << 1 ), |