diff options
| author | Tad Marshall <tad@10gen.com> | 2012-10-15 16:40:29 -0400 |
|---|---|---|
| committer | Spencer T Brody <spencer@10gen.com> | 2013-03-21 15:12:33 -0400 |
| commit | 415ccd3c89eed61d8fa87efaa94045c4c8d5ad75 (patch) | |
| tree | f9a96bb5188bbac059a5106fdebd27eec74f1568 | |
| parent | 2802b46fde6d3c20f738df0a233ebd0f0f5f8083 (diff) | |
| download | mongo-415ccd3c89eed61d8fa87efaa94045c4c8d5ad75.tar.gz | |
SERVER-7034 add 10 second timeouts to three connections
Change the timeout on three ScopedDbConnections (made while holding
a critical section) from default of zero (no timeout) to 10 seconds.
Conflicts:
src/mongo/s/d_migrate.cpp
| -rw-r--r-- | src/mongo/s/d_migrate.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp index 1d8867c311e..c633eceaa36 100644 --- a/src/mongo/s/d_migrate.cpp +++ b/src/mongo/s/d_migrate.cpp @@ -1280,7 +1280,8 @@ namespace mongo { try { scoped_ptr<ScopedDbConnection> conn( ScopedDbConnection::getInternalScopedDbConnection( - shardingState.getConfigServer() ) ); + shardingState.getConfigServer(), + 10.0 ) ); ok = conn->get()->runCommand( "config" , cmd , cmdResult ); conn->done(); } @@ -1307,7 +1308,8 @@ namespace mongo { try { scoped_ptr<ScopedDbConnection> conn( ScopedDbConnection::getInternalScopedDbConnection( - shardingState.getConfigServer() ) ); + shardingState.getConfigServer(), + 10.0 ) ); // look for the chunk in this shard whose version got bumped // we assume that if that mod made it to the config, the applyOps was successful |