Permalink
Browse files

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
  • Loading branch information...
1 parent 2802b46 commit 415ccd3c89eed61d8fa87efaa94045c4c8d5ad75 @tadmarshall tadmarshall committed with stbrody Oct 15, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 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

0 comments on commit 415ccd3

Please sign in to comment.