diff options
Diffstat (limited to 'src/mongo/db/repl/repl_set_impl.cpp')
-rw-r--r-- | src/mongo/db/repl/repl_set_impl.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/mongo/db/repl/repl_set_impl.cpp b/src/mongo/db/repl/repl_set_impl.cpp index 5274e461f07..01f78853e04 100644 --- a/src/mongo/db/repl/repl_set_impl.cpp +++ b/src/mongo/db/repl/repl_set_impl.cpp @@ -435,8 +435,7 @@ namespace { } void ReplSetImpl::loadLastOpTimeWritten(bool quiet) { - OperationContextImpl txn; // XXX? - Lock::DBRead lk(txn.lockState(), rsoplog); + Lock::DBRead lk(rsoplog); BSONObj o; if (Helpers::getLast(rsoplog, o)) { lastH = o["h"].numberLong(); @@ -446,8 +445,7 @@ namespace { } OpTime ReplSetImpl::getEarliestOpTimeWritten() const { - OperationContextImpl txn; // XXX? - Lock::DBRead lk(txn.lockState(), rsoplog); + Lock::DBRead lk(rsoplog); BSONObj o; uassert(17347, "Problem reading earliest entry from oplog", Helpers::getFirst(rsoplog, o)); return o["ts"]._opTime(); @@ -861,20 +859,19 @@ namespace { const BSONObj ReplSetImpl::_initialSyncFlag(BSON(_initialSyncFlagString << true)); void ReplSetImpl::clearInitialSyncFlag() { + Lock::DBWrite lk("local"); OperationContextImpl txn; // XXX? - Lock::DBWrite lk(txn.lockState(), "local"); Helpers::putSingleton(&txn, "local.replset.minvalid", BSON("$unset" << _initialSyncFlag)); } void ReplSetImpl::setInitialSyncFlag() { + Lock::DBWrite lk("local"); OperationContextImpl txn; // XXX? - Lock::DBWrite lk(txn.lockState(), "local"); Helpers::putSingleton(&txn, "local.replset.minvalid", BSON("$set" << _initialSyncFlag)); } bool ReplSetImpl::getInitialSyncFlag() { - OperationContextImpl txn; // XXX? - Lock::DBRead lk (txn.lockState(), "local"); + Lock::DBRead lk ("local"); BSONObj mv; if (Helpers::getSingleton("local.replset.minvalid", mv)) { return mv[_initialSyncFlagString].trueValue(); @@ -887,15 +884,13 @@ namespace { BSONObjBuilder subobj(builder.subobjStart("$set")); subobj.appendTimestamp("ts", obj["ts"].date()); subobj.done(); - + Lock::DBWrite lk("local"); OperationContextImpl txn; // XXX? - Lock::DBWrite lk(txn.lockState(), "local"); Helpers::putSingleton(&txn, "local.replset.minvalid", builder.obj()); } OpTime ReplSetImpl::getMinValid() { - OperationContextImpl txn; // XXX? - Lock::DBRead lk(txn.lockState(), "local.replset.minvalid"); + Lock::DBRead lk("local.replset.minvalid"); BSONObj mv; if (Helpers::getSingleton("local.replset.minvalid", mv)) { return mv["ts"]._opTime(); |