diff options
author | Spencer T Brody <spencer@10gen.com> | 2012-11-14 15:43:49 -0500 |
---|---|---|
committer | Dan Pasette <dan@10gen.com> | 2012-11-17 12:08:08 -0500 |
commit | 5a4b6a0acc92c171e7b8fd7fecd26585e76b60be (patch) | |
tree | 19c4e9c85e6226570b509b5821720b10adcc573e | |
parent | fed35f0c0829626dddeef23c3d9b9e373fe9353f (diff) | |
download | mongo-5a4b6a0acc92c171e7b8fd7fecd26585e76b60be.tar.gz |
SERVER-7665 Use getInternalScopedDbConnection for updating RS configuration in config servers
-rw-r--r-- | jstests/sharding/repl_monitor_refresh.js | 2 | ||||
-rw-r--r-- | src/mongo/s/config.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/jstests/sharding/repl_monitor_refresh.js b/jstests/sharding/repl_monitor_refresh.js index 7214cb2081b..de2d7ae2347 100644 --- a/jstests/sharding/repl_monitor_refresh.js +++ b/jstests/sharding/repl_monitor_refresh.js @@ -5,7 +5,7 @@ var NODE_COUNT = 3; var st = new ShardingTest({ shards: { rs0: { nodes: NODE_COUNT, oplogSize: 10 }}, - separateConfig: true }); + separateConfig: true, config : 3 }); var replTest = st.rs0; var mongos = st.s; diff --git a/src/mongo/s/config.cpp b/src/mongo/s/config.cpp index fa3d43defce..8c8a2d2fbbf 100644 --- a/src/mongo/s/config.cpp +++ b/src/mongo/s/config.cpp @@ -1033,15 +1033,16 @@ namespace mongo { log(1) << "replicaSetChange: shard not found for set: " << monitor->getServerAddress() << endl; return; } - scoped_ptr<ScopedDbConnection> conn( ScopedDbConnection::getScopedDbConnection( + scoped_ptr<ScopedDbConnection> conn( ScopedDbConnection::getInternalScopedDbConnection( configServer.getConnectionString().toString(), 30.0 ) ); conn->get()->update( ShardNS::shard, BSON( "_id" << s.getName() ), BSON( "$set" << BSON( "host" << monitor->getServerAddress() ) ) ); conn->done(); } - catch ( DBException & ) { - error() << "RSChangeWatcher: could not update config db for set: " << monitor->getName() << " to: " << monitor->getServerAddress() << endl; + catch (DBException& e) { + error() << "RSChangeWatcher: could not update config db for set: " << monitor->getName() + << " to: " << monitor->getServerAddress() << causedBy(e) << endl; } } |