diff options
author | Eric Milkie <milkie@10gen.com> | 2013-01-25 10:33:46 -0500 |
---|---|---|
committer | Eric Milkie <milkie@10gen.com> | 2013-03-25 11:49:41 -0400 |
commit | 568e95e3dad7ee511565056db4f03586cd5ad018 (patch) | |
tree | 5be460c0333f77e9b9cea35132d2eb2ff6a66301 | |
parent | 8e252ca206118f3b64ccef4e857e2e84c26a10e0 (diff) | |
download | mongo-568e95e3dad7ee511565056db4f03586cd5ad018.tar.gz |
SERVER-9095 fix reconfig.js on Windows by removing Client from heartbeat thread
The heartbeat thread has no use for a Client context, and it has trouble
at process shutdown time -- it tends to hit an access violation on Windows
when it tries to destruct the Client context.
-rw-r--r-- | src/mongo/db/repl/heartbeat.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mongo/db/repl/heartbeat.cpp b/src/mongo/db/repl/heartbeat.cpp index 875af670147..253544a54be 100644 --- a/src/mongo/db/repl/heartbeat.cpp +++ b/src/mongo/db/repl/heartbeat.cpp @@ -143,13 +143,6 @@ namespace mongo { "checkEmpty" << checkEmpty << "from" << from ); - // generally not a great idea to do outbound waiting calls in a - // write lock. heartbeats can be slow (multisecond to respond), so - // generally we don't want to be locked, at least not without - // thinking acarefully about it first. - massert(15900, "can't heartbeat: too much lock", - !Lock::somethingWriteLocked() || theReplSet == 0 || !theReplSet->lockedByMe() ); - ScopedConn conn(memberFullName); return conn.runCommand("admin", cmd, @@ -196,7 +189,7 @@ namespace mongo { string name() const { return "rsHealthPoll"; } - void setUp() { Client::initThread( name().c_str() ); } + void setUp() { } void doWork() { if ( !theReplSet ) { |