diff options
author | dwight <dwight@Dwights-MacBook-2.local> | 2009-01-10 18:17:23 -0500 |
---|---|---|
committer | dwight <dwight@Dwights-MacBook-2.local> | 2009-01-10 18:17:23 -0500 |
commit | 8428e6cbda95390bc28717b3aafaee3803f80b60 (patch) | |
tree | 581abd7b53f2a0b8a5781bec6bf2ca5b66345aa9 /db/repl.cpp | |
parent | ffc3bb2216da756a77c18065a52c3cc1bb694cd3 (diff) | |
download | mongo-8428e6cbda95390bc28717b3aafaee3803f80b60.tar.gz |
command work client driver
Diffstat (limited to 'db/repl.cpp')
-rw-r--r-- | db/repl.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/db/repl.cpp b/db/repl.cpp index 06a51711b7f..0169712fdab 100644 --- a/db/repl.cpp +++ b/db/repl.cpp @@ -116,10 +116,10 @@ void ReplPair::arbitrate() { return; } + /* todo: make an arbitrate command we send to the arbiter instead of this */ bool is_master; - BSONObj res = conn->cmdIsMaster(is_master); - /*findOne("admin.$cmd", ismasterobj);*/ - if ( res.isEmpty() ) { + bool ok = conn->isMaster(is_master); + if ( !ok ) { setMasterLocked(State_CantArb, "can't arb 2"); return; } @@ -337,10 +337,6 @@ struct TestOpTime { } } testoptime; -int test2() { - return 0; -} - /* --------------------------------------------------------------*/ ReplSource::ReplSource() { |