SERVER-16414 Remove unnecessary OperationContext arguments from ReplicationCoordinator methods

14 files changed, 118 insertions, 151 deletions

diff --git a/src/mongo/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp
index c8a5c8c03ab..68b81e22009 100644
--- a/src/mongo/db/clientcursor.cpp
+++ b/src/mongo/db/clientcursor.cpp
@@ -185,7 +185,7 @@ namespace mongo {
         if (!rid.isSet())
             return;
 
-        repl::getGlobalReplicationCoordinator()->setLastOptimeForSlave(txn, rid, _slaveReadTill);
+        repl::getGlobalReplicationCoordinator()->setLastOptimeForSlave(rid, _slaveReadTill);
     }
 
     //
diff --git a/src/mongo/db/dbcommands.cpp b/src/mongo/db/dbcommands.cpp
index bb8533d0f68..915b5fff6db 100644
--- a/src/mongo/db/dbcommands.cpp
+++ b/src/mongo/db/dbcommands.cpp
@@ -1254,18 +1254,15 @@ namespace mongo {
        assumption needs to be audited and documented. */
     class MaintenanceModeSetter {
     public:
-        MaintenanceModeSetter(OperationContext* txn) :
-            _txn(txn),
+        MaintenanceModeSetter() :
             maintenanceModeSet(
-                    repl::getGlobalReplicationCoordinator()->setMaintenanceMode(txn, true).isOK())
+                    repl::getGlobalReplicationCoordinator()->setMaintenanceMode(true).isOK())
             {}
         ~MaintenanceModeSetter() {
             if (maintenanceModeSet)
-                repl::getGlobalReplicationCoordinator()->setMaintenanceMode(_txn, false);
+                repl::getGlobalReplicationCoordinator()->setMaintenanceMode(false);
         } 
     private:
-        // Not owned.
-        OperationContext* _txn;
         bool maintenanceModeSet;
     };
 
@@ -1404,7 +1401,7 @@ namespace mongo {
         if (c->maintenanceMode() &&
                 repl::getGlobalReplicationCoordinator()->getReplicationMode() ==
                         repl::ReplicationCoordinator::modeReplSet) {
-            mmSetter.reset(new MaintenanceModeSetter(txn));
+            mmSetter.reset(new MaintenanceModeSetter);
         }
 
         if (c->shouldAffectCommandCounter()) {
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index aeb85b9fde5..ea1259519b1 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -187,7 +187,7 @@ namespace repl {
 
             ctx.getClient()->setLastOp( ts );
             
-            replCoord->setMyLastOptime(txn, ts);
+            replCoord->setMyLastOptime(ts);
         }
 
         setNewOptime(ts);
@@ -317,7 +317,7 @@ namespace repl {
         checkOplogInsert( localOplogRSCollection->insertDocument( txn, &writer, false ) );
 
         ctx.getClient()->setLastOp( slot.first );
-        replCoord->setMyLastOptime(txn, slot.first);
+        replCoord->setMyLastOptime(slot.first);
 
         wunit.commit();
 
@@ -385,7 +385,7 @@ namespace repl {
         ctx.getClient()->setLastOp( slot.first );
 
         ReplicationCoordinator* replCoord = getGlobalReplicationCoordinator();
-        replCoord->setMyLastOptime(txn, slot.first);
+        replCoord->setMyLastOptime(slot.first);
         wunit.commit();
     }
 
diff --git a/src/mongo/db/repl/repl_coordinator.h b/src/mongo/db/repl/repl_coordinator.h
index 9a1da759161..40a2317814e 100644
--- a/src/mongo/db/repl/repl_coordinator.h
+++ b/src/mongo/db/repl/repl_coordinator.h
@@ -234,15 +234,13 @@ namespace repl {
         /**
          * Updates our internal tracking of the last OpTime applied for the given slave
          * identified by "rid".  Only valid to call in master/slave mode
-         * TODO(spencer): Remove txn argument and make into a void function when legacy is gone.
          */
-        virtual Status setLastOptimeForSlave(
-                OperationContext* txn, const OID& rid, const OpTime& ts) = 0;
+        virtual Status setLastOptimeForSlave(const OID& rid, const OpTime& ts) = 0;
 
         /**
          * Updates our internal tracking of the last OpTime applied to this node.
          */
-        virtual Status setMyLastOptime(OperationContext* txn, const OpTime& ts) = 0;
+        virtual void setMyLastOptime(const OpTime& ts) = 0;
 
         /**
          * Updates our the message we include in heartbeat responses.
@@ -315,8 +313,7 @@ namespace repl {
          * Prepares a BSONObj describing an invocation of the replSetUpdatePosition command that can
          * be sent to this node's sync source to update it about our progress in replication.
          */
-        virtual void prepareReplSetUpdatePositionCommand(OperationContext* txn,
-                                                         BSONObjBuilder* cmdBuilder) = 0;
+        virtual void prepareReplSetUpdatePositionCommand(BSONObjBuilder* cmdBuilder) = 0;
 
         /**
          * For ourself and each secondary chaining off of us, adds a BSONObj to "handshakes"
@@ -325,7 +322,6 @@ namespace repl {
          * we are replicating off of it.
          */
         virtual void prepareReplSetUpdatePositionCommandHandshakes(
-                OperationContext* txn,
                 std::vector<BSONObj>* handshakes) = 0;
 
         /**
@@ -355,7 +351,7 @@ namespace repl {
          * return Status::OK if the change worked, NotSecondary if it failed because we are
          * PRIMARY, and OperationFailed if we are not currently in maintenance mode
          */
-        virtual Status setMaintenanceMode(OperationContext* txn, bool activate) = 0;
+        virtual Status setMaintenanceMode(bool activate) = 0;
 
         /**
          * Retrieves the current count of maintenanceMode and returns 'true' if greater than 0.
@@ -465,8 +461,7 @@ namespace repl {
          * If a non-OK status is returned, it is unspecified whether none or some of the updates
          * were applied.
          */
-        virtual Status processReplSetUpdatePosition(OperationContext* txn,
-                                                    const UpdatePositionArgs& updates) = 0;
+        virtual Status processReplSetUpdatePosition(const UpdatePositionArgs& updates) = 0;
 
         /**
          * Handles an incoming Handshake command (or a handshake from replSetUpdatePosition).
@@ -478,8 +473,7 @@ namespace repl {
          * and ErrorCodes::NotMasterOrSecondaryCode if we're in state REMOVED or otherwise don't
          * have a valid config.
          */
-        virtual Status processHandshake(const OperationContext* txn,
-                                        const HandshakeArgs& handshake) = 0;
+        virtual Status processHandshake(OperationContext* txn, const HandshakeArgs& handshake) = 0;
 
         /**
          * Returns a bool indicating whether or not this node builds indexes.
diff --git a/src/mongo/db/repl/repl_coordinator_impl.cpp b/src/mongo/db/repl/repl_coordinator_impl.cpp
index 663fc2420a6..f2dfab48b14 100644
--- a/src/mongo/db/repl/repl_coordinator_impl.cpp
+++ b/src/mongo/db/repl/repl_coordinator_impl.cpp
@@ -645,8 +645,7 @@ namespace {
         }
     }
 
-    Status ReplicationCoordinatorImpl::setLastOptimeForSlave(OperationContext* txn,
-                                                             const OID& rid,
+    Status ReplicationCoordinatorImpl::setLastOptimeForSlave(const OID& rid,
                                                              const OpTime& ts) {
         boost::unique_lock<boost::mutex> lock(_mutex);
         massert(28576,
@@ -683,10 +682,9 @@ namespace {
         _replExecutor.wait(cbh.getValue());
     }
 
-    Status ReplicationCoordinatorImpl::setMyLastOptime(OperationContext* txn, const OpTime& ts) {
+    void ReplicationCoordinatorImpl::setMyLastOptime(const OpTime& ts) {
         boost::unique_lock<boost::mutex> lock(_mutex);
         _setMyLastOptime_inlock(&lock, ts);
-        return Status::OK();
     }
 
     void ReplicationCoordinatorImpl::_setMyLastOptime_inlock(
@@ -1318,7 +1316,6 @@ namespace {
     }
 
     void ReplicationCoordinatorImpl::prepareReplSetUpdatePositionCommand(
-            OperationContext* txn,
             BSONObjBuilder* cmdBuilder) {
         boost::lock_guard<boost::mutex> lock(_mutex);
         invariant(_rsConfig.isInitialized());
@@ -1349,7 +1346,6 @@ namespace {
     }
 
     void ReplicationCoordinatorImpl::prepareReplSetUpdatePositionCommandHandshakes(
-            OperationContext* txn,
             std::vector<BSONObj>* handshakes) {
         boost::lock_guard<boost::mutex> lock(_mutex);
         // handshake objs for ourself and all chained members
@@ -1475,7 +1471,7 @@ namespace {
         *maintenanceMode = _topCoord->getMaintenanceCount() > 0;
     }
 
-    Status ReplicationCoordinatorImpl::setMaintenanceMode(OperationContext* txn, bool activate) {
+    Status ReplicationCoordinatorImpl::setMaintenanceMode(bool activate) {
         Status result(ErrorCodes::InternalError, "didn't set status in _setMaintenanceMode_helper");
         CBHStatus cbh = _replExecutor.scheduleWork(
             stdx::bind(&ReplicationCoordinatorImpl::_setMaintenanceMode_helper,
@@ -2079,7 +2075,6 @@ namespace {
     }
 
     Status ReplicationCoordinatorImpl::processReplSetUpdatePosition(
-            OperationContext* txn,
             const UpdatePositionArgs& updates) {
 
         boost::unique_lock<boost::mutex> lock(_mutex);
@@ -2102,7 +2097,7 @@ namespace {
         return status;
     }
 
-    Status ReplicationCoordinatorImpl::processHandshake(const OperationContext* txn,
+    Status ReplicationCoordinatorImpl::processHandshake(OperationContext* txn,
                                                         const HandshakeArgs& handshake) {
         LOG(2) << "Received handshake " << handshake.toBSON();
 
@@ -2304,7 +2299,7 @@ namespace {
         else {
             lastOpTime = lastOpTimeStatus.getValue();
         }
-        setMyLastOptime(txn, lastOpTime);
+        setMyLastOptime(lastOpTime);
     }
 
     void ReplicationCoordinatorImpl::_shouldChangeSyncSource(
diff --git a/src/mongo/db/repl/repl_coordinator_impl.h b/src/mongo/db/repl/repl_coordinator_impl.h
index 68dc6f83b2a..4c02d76bf84 100644
--- a/src/mongo/db/repl/repl_coordinator_impl.h
+++ b/src/mongo/db/repl/repl_coordinator_impl.h
@@ -131,10 +131,9 @@ namespace repl {
 
         virtual bool shouldIgnoreUniqueIndex(const IndexDescriptor* idx);
 
-        virtual Status setLastOptimeForSlave(
-                OperationContext* txn, const OID& rid, const OpTime& ts);
+        virtual Status setLastOptimeForSlave(const OID& rid, const OpTime& ts);
 
-        virtual Status setMyLastOptime(OperationContext* txn, const OpTime& ts);
+        virtual void setMyLastOptime(const OpTime& ts);
 
         virtual void setMyHeartbeatMessage(const std::string& msg);
 
@@ -154,11 +153,9 @@ namespace repl {
 
         virtual void signalUpstreamUpdater();
 
-        virtual void prepareReplSetUpdatePositionCommand(OperationContext* txn,
-                                                         BSONObjBuilder* cmdBuilder);
+        virtual void prepareReplSetUpdatePositionCommand(BSONObjBuilder* cmdBuilder);
 
         virtual void prepareReplSetUpdatePositionCommandHandshakes(
-                OperationContext* txn,
                 std::vector<BSONObj>* handshakes);
 
         virtual Status processReplSetGetStatus(BSONObjBuilder* result);
@@ -169,7 +166,7 @@ namespace repl {
 
         virtual void processReplSetGetConfig(BSONObjBuilder* result);
 
-        virtual Status setMaintenanceMode(OperationContext* txn, bool activate);
+        virtual Status setMaintenanceMode(bool activate);
 
         virtual bool getMaintenanceMode();
 
@@ -199,11 +196,9 @@ namespace repl {
         virtual Status processReplSetElect(const ReplSetElectArgs& args,
                                            BSONObjBuilder* response);
 
-        virtual Status processReplSetUpdatePosition(OperationContext* txn,
-                                                    const UpdatePositionArgs& updates);
+        virtual Status processReplSetUpdatePosition(const UpdatePositionArgs& updates);
 
-        virtual Status processHandshake(const OperationContext* txn,
-                                        const HandshakeArgs& handshake);
+        virtual Status processHandshake(OperationContext* txn, const HandshakeArgs& handshake);
 
         virtual bool buildsIndexes();
 
diff --git a/src/mongo/db/repl/repl_coordinator_impl_elect_test.cpp b/src/mongo/db/repl/repl_coordinator_impl_elect_test.cpp
index 97b9f37e358..8f946d514c4 100644
--- a/src/mongo/db/repl/repl_coordinator_impl_elect_test.cpp
+++ b/src/mongo/db/repl/repl_coordinator_impl_elect_test.cpp
@@ -163,7 +163,7 @@ namespace {
                                 ));
         assertStartSuccess(configObj, HostAndPort("node1", 12345));
         OperationContextNoop txn;
-        getReplCoord()->setMyLastOptime(&txn, OpTime (100, 1));
+        getReplCoord()->setMyLastOptime(OpTime (100, 1));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
         startCapturingLogMessages();
         simulateSuccessfulElection();
@@ -185,7 +185,7 @@ namespace {
 
         OperationContextNoop txn;
         OpTime time1(100, 1);
-        getReplCoord()->setMyLastOptime(&txn, time1);
+        getReplCoord()->setMyLastOptime(time1);
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
 
         simulateEnoughHeartbeatsForElectability();
@@ -232,7 +232,7 @@ namespace {
 
         OperationContextNoop txn;
         OpTime time1(100, 1);
-        getReplCoord()->setMyLastOptime(&txn, time1);
+        getReplCoord()->setMyLastOptime(time1);
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
 
         simulateEnoughHeartbeatsForElectability();
diff --git a/src/mongo/db/repl/repl_coordinator_impl_reconfig_test.cpp b/src/mongo/db/repl/repl_coordinator_impl_reconfig_test.cpp
index 0b9017c1553..74fd78cf59b 100644
--- a/src/mongo/db/repl/repl_coordinator_impl_reconfig_test.cpp
+++ b/src/mongo/db/repl/repl_coordinator_impl_reconfig_test.cpp
@@ -92,7 +92,7 @@ namespace {
                                                  BSON("_id" << 2 << "host" << "node2:12345") )),
                     HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         BSONObjBuilder result;
@@ -123,7 +123,7 @@ namespace {
                                                  BSON("_id" << 2 << "host" << "node2:12345") )),
                     HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         BSONObjBuilder result;
@@ -151,7 +151,7 @@ namespace {
                                                  BSON("_id" << 2 << "host" << "node2:12345") )),
                     HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         BSONObjBuilder result;
@@ -207,7 +207,7 @@ namespace {
                                                  BSON("_id" << 2 << "host" << "node2:12345") )),
                     HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         Status status(ErrorCodes::InternalError, "Not Set");
@@ -243,7 +243,7 @@ namespace {
                                                  BSON("_id" << 2 << "host" << "node2:12345") )),
                     HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         Status status(ErrorCodes::InternalError, "Not Set");
@@ -281,7 +281,7 @@ namespace {
                                                  BSON("_id" << 2 << "host" << "node2:12345") )),
                     HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         Status status(ErrorCodes::InternalError, "Not Set");
@@ -316,7 +316,7 @@ namespace {
         init();
         start(HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
 
         // initiate
         Status status(ErrorCodes::InternalError, "Not Set");
@@ -354,7 +354,7 @@ namespace {
                                                  BSON("_id" << 2 << "host" << "node2:12345"))),
                     HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         Status status(ErrorCodes::InternalError, "Not Set");
@@ -391,7 +391,7 @@ namespace {
                                                   BSON("_id" << 2 << "host" << "node2:12345") )),
                      HostAndPort("node1", 12345));
          ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-         getReplCoord()->setMyLastOptime(&txn, OpTime(100,0));
+         getReplCoord()->setMyLastOptime(OpTime(100,0));
          simulateSuccessfulElection();
          ASSERT_TRUE(getReplCoord()->getCurrentMemberState().primary());
 
@@ -443,7 +443,7 @@ namespace {
 //                                                  BSON("_id" << 2 << "host" << "node2:12345") )),
 //                     HostAndPort("node1", 12345));
 //         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-//         getReplCoord()->setMyLastOptime(&txn, OpTime(100,0));
+//         getReplCoord()->setMyLastOptime(OpTime(100,0));
 //         simulateSuccessfulElection();
 //         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().primary());
 // 
@@ -510,7 +510,7 @@ namespace {
                                                  BSON("_id" << 2 << "host" << "node2:12345") )),
                     HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
 
         // fail before forced
         BSONObjBuilder result;
diff --git a/src/mongo/db/repl/repl_coordinator_impl_test.cpp b/src/mongo/db/repl/repl_coordinator_impl_test.cpp
index 4815b36db8a..e1b5ed04d31 100644
--- a/src/mongo/db/repl/repl_coordinator_impl_test.cpp
+++ b/src/mongo/db/repl/repl_coordinator_impl_test.cpp
@@ -464,7 +464,7 @@ namespace {
         ASSERT_EQUALS(ErrorCodes::NotMaster, statusAndDur.status);
 
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         statusAndDur = getReplCoord()->awaitReplication(&txn, time, writeConcern);
@@ -482,7 +482,7 @@ namespace {
                                              BSON("host" << "node4:12345" << "_id" << 3))),
                 HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         OID client1 = OID::gen();
@@ -509,7 +509,7 @@ namespace {
         ReplicationCoordinator::StatusAndDuration statusAndDur =
                                         getReplCoord()->awaitReplication(&txn, time1, writeConcern);
         ASSERT_EQUALS(ErrorCodes::ExceededTimeLimit, statusAndDur.status);
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, time1));
+        getReplCoord()->setMyLastOptime(time1);
         statusAndDur = getReplCoord()->awaitReplication(&txn, time1, writeConcern);
         ASSERT_OK(statusAndDur.status);
 
@@ -524,7 +524,7 @@ namespace {
         // 2 nodes waiting for time2
         statusAndDur = getReplCoord()->awaitReplication(&txn, time2, writeConcern);
         ASSERT_EQUALS(ErrorCodes::ExceededTimeLimit, statusAndDur.status);
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, time2));
+        getReplCoord()->setMyLastOptime(time2);
         statusAndDur = getReplCoord()->awaitReplication(&txn, time2, writeConcern);
         ASSERT_EQUALS(ErrorCodes::ExceededTimeLimit, statusAndDur.status);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(client3, time2));
@@ -570,7 +570,7 @@ namespace {
                                              "multiDCAndRack" << BSON("dc" << 2 << "rack" << 3)))),
                 HostAndPort("node0"));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         OID clientRID1 = OID::gen();
@@ -618,7 +618,7 @@ namespace {
 
 
         // Nothing satisfied
-        getReplCoord()->setMyLastOptime(&txn, time1);
+        getReplCoord()->setMyLastOptime(time1);
         statusAndDur = getReplCoord()->awaitReplication(&txn, time1, majorityWriteConcern);
         ASSERT_EQUALS(ErrorCodes::ExceededTimeLimit, statusAndDur.status);
         statusAndDur = getReplCoord()->awaitReplication(&txn, time1, multiDCWriteConcern);
@@ -648,7 +648,7 @@ namespace {
         ASSERT_OK(statusAndDur.status);
 
         // multiDC satisfied but not majority or multiRack
-        getReplCoord()->setMyLastOptime(&txn, time2);
+        getReplCoord()->setMyLastOptime(time2);
         getReplCoord()->setLastOptime_forTest(clientRID3, time2);
 
         statusAndDur = getReplCoord()->awaitReplication(&txn, time2, majorityWriteConcern);
@@ -729,7 +729,7 @@ namespace {
                                              BSON("host" << "node3:12345" << "_id" << 2))),
                 HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         ReplicationAwaiter awaiter(getReplCoord(), &txn);
@@ -754,7 +754,7 @@ namespace {
         awaiter.setOpTime(time1);
         awaiter.setWriteConcern(writeConcern);
         awaiter.start(&txn);
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, time1));
+        getReplCoord()->setMyLastOptime(time1);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(client1, time1));
         ReplicationCoordinator::StatusAndDuration statusAndDur = awaiter.getResult();
         ASSERT_OK(statusAndDur.status);
@@ -763,7 +763,7 @@ namespace {
         // 2 nodes waiting for time2
         awaiter.setOpTime(time2);
         awaiter.start(&txn);
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, time2));
+        getReplCoord()->setMyLastOptime(time2);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(client1, time2));
         statusAndDur = awaiter.getResult();
         ASSERT_OK(statusAndDur.status);
@@ -789,7 +789,7 @@ namespace {
                                              BSON("host" << "node3:12345" << "_id" << 2))),
                 HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         ReplicationAwaiter awaiter(getReplCoord(), &txn);
@@ -810,7 +810,7 @@ namespace {
         awaiter.setOpTime(time2);
         awaiter.setWriteConcern(writeConcern);
         awaiter.start(&txn);
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, time2));
+        getReplCoord()->setMyLastOptime(time2);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(client, time1));
         ReplicationCoordinator::StatusAndDuration statusAndDur = awaiter.getResult();
         ASSERT_EQUALS(ErrorCodes::ExceededTimeLimit, statusAndDur.status);
@@ -827,7 +827,7 @@ namespace {
                                              BSON("host" << "node3:12345" << "_id" << 2))),
                 HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         ReplicationAwaiter awaiter(getReplCoord(), &txn);
@@ -872,7 +872,7 @@ namespace {
                                              BSON("host" << "node3:12345" << "_id" << 2))),
                 HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         ReplicationAwaiter awaiter(getReplCoord(), &txn);
@@ -957,7 +957,7 @@ namespace {
                                              BSON("_id" << 2 << "host" << "node3"))),
                 HostAndPort("node1"));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         ReplicationAwaiter awaiter(getReplCoord(), &txn);
@@ -1035,7 +1035,7 @@ namespace {
         OperationContextReplMock txn;
         OpTime optime1(100, 1);
         // All nodes are caught up
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, optime1));
+        getReplCoord()->setMyLastOptime(optime1);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid2, optime1));
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid3, optime1));
 
@@ -1048,7 +1048,7 @@ namespace {
         OperationContextReplMock txn;
         OpTime optime1(100, 1);
         // All nodes are caught up
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, optime1));
+        getReplCoord()->setMyLastOptime(optime1);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid2, optime1));
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid3, optime1));
 
@@ -1066,7 +1066,7 @@ namespace {
         OperationContextReplMock txn;
         OpTime optime1(100, 1);
         // All nodes are caught up
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, optime1));
+        getReplCoord()->setMyLastOptime(optime1);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid2, optime1));
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid3, optime1));
 
@@ -1203,7 +1203,7 @@ namespace {
         OpTime optime1(100, 1);
         OpTime optime2(100, 2);
         // No secondary is caught up
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, optime2));
+        getReplCoord()->setMyLastOptime(optime2);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid2, optime1));
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid3, optime1));
 
@@ -1245,7 +1245,7 @@ namespace {
         OpTime optime1(100, 1);
         OpTime optime2(100, 2);
         // No secondary is caught up
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, optime2));
+        getReplCoord()->setMyLastOptime(optime2);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid2, optime1));
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid3, optime1));
 
@@ -1293,7 +1293,7 @@ namespace {
         OpTime optime1(100, 1);
         OpTime optime2(100, 2);
         // No secondary is caught up
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, optime2));
+        getReplCoord()->setMyLastOptime(optime2);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid2, optime1));
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid3, optime1));
 
@@ -1381,13 +1381,13 @@ namespace {
         OpTime optime1(100, 1);
         OpTime optime2(100, 2);
         OpTime optime3(2, 1);
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, optime1));
+        getReplCoord()->setMyLastOptime(optime1);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid2, optime2));
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(rid3, optime3));
 
         // Check that the proper BSON is generated for the replSetUpdatePositionCommand
         BSONObjBuilder cmdBuilder;
-        getReplCoord()->prepareReplSetUpdatePositionCommand(&txn, &cmdBuilder);
+        getReplCoord()->prepareReplSetUpdatePositionCommand(&cmdBuilder);
         BSONObj cmd = cmdBuilder.done();
 
         ASSERT_EQUALS(2, cmd.nFields());
@@ -1422,7 +1422,7 @@ namespace {
         // Test generating basic handshake with no chaining
         std::vector<BSONObj> handshakes;
         OperationContextNoop txn;
-        getReplCoord()->prepareReplSetUpdatePositionCommandHandshakes(&txn, &handshakes);
+        getReplCoord()->prepareReplSetUpdatePositionCommandHandshakes(&handshakes);
         ASSERT_EQUALS(1U, handshakes.size());
         BSONObj handshakeCmd = handshakes[0];
         ASSERT_EQUALS(2, handshakeCmd.nFields());
@@ -1446,7 +1446,7 @@ namespace {
         ASSERT_OK(getReplCoord()->processHandshake(&txn, slave1Handshake));
         ASSERT_OK(getReplCoord()->processHandshake(&txn, slave2Handshake));
 
-        getReplCoord()->prepareReplSetUpdatePositionCommandHandshakes(&txn, &handshakes);
+        getReplCoord()->prepareReplSetUpdatePositionCommandHandshakes(&handshakes);
         ASSERT_EQUALS(3U, handshakes.size());
         std::set<OID> rids;
         for (std::vector<BSONObj>::iterator it = handshakes.begin(); it != handshakes.end(); ++it) {
@@ -1481,15 +1481,15 @@ namespace {
                 HostAndPort("test2", 1234));
         OperationContextNoop txn;
         getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY);
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
 
         // Can't unset maintenance mode if it was never set to begin with.
-        Status status = getReplCoord()->setMaintenanceMode(&txn, false);
+        Status status = getReplCoord()->setMaintenanceMode(false);
         ASSERT_EQUALS(ErrorCodes::OperationFailed, status);
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().secondary());
 
         // valid set
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, true));
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(true));
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().recovering());
 
         // If we go into rollback while in maintenance mode, our state changes to RS_ROLLBACK.
@@ -1501,14 +1501,14 @@ namespace {
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().recovering());
 
         // Can set multiple times
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, true));
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, true));
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(true));
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(true));
 
         // Need to unset the number of times you set
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, false));
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, false));
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, false));
-        status = getReplCoord()->setMaintenanceMode(&txn, false);
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(false));
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(false));
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(false));
+        status = getReplCoord()->setMaintenanceMode(false);
         // fourth one fails b/c we only set three times
         ASSERT_EQUALS(ErrorCodes::OperationFailed, status);
         // Unsetting maintenance mode changes our state to secondary if maintenance mode was
@@ -1519,19 +1519,19 @@ namespace {
         // state.
         getReplCoord()->setFollowerMode(MemberState::RS_ROLLBACK);
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().rollback());
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, true));
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(true));
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().rollback());
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, false));
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(false));
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().rollback());
 
         // Rollback is sticky even if entered while in maintenance mode.
         getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY);
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().secondary());
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, true));
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(true));
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().recovering());
         getReplCoord()->setFollowerMode(MemberState::RS_ROLLBACK);
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().rollback());
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, false));
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(false));
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().rollback());
         getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY);
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().secondary());
@@ -1539,16 +1539,16 @@ namespace {
         // Can't modify maintenance mode when PRIMARY
          simulateSuccessfulElection();
 
-        status = getReplCoord()->setMaintenanceMode(&txn, true);
+        status = getReplCoord()->setMaintenanceMode(true);
         ASSERT_EQUALS(ErrorCodes::NotSecondary, status);
         ASSERT_TRUE(getReplCoord()->getCurrentMemberState().primary());
 
         simulateStepDownOnIsolation();
 
-        status = getReplCoord()->setMaintenanceMode(&txn, false);
+        status = getReplCoord()->setMaintenanceMode(false);
         ASSERT_EQUALS(ErrorCodes::OperationFailed, status);
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, true));
-        ASSERT_OK(getReplCoord()->setMaintenanceMode(&txn, false));
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(true));
+        ASSERT_OK(getReplCoord()->setMaintenanceMode(false));
     }
 
     TEST_F(ReplCoordTest, GetHostsWrittenToReplSet) {
@@ -1576,7 +1576,7 @@ namespace {
         ASSERT_OK(handshake2.initialize(BSON("handshake" << client2 << "member" << 2)));
         ASSERT_OK(getReplCoord()->processHandshake(&txn, handshake2));
 
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, time2));
+        getReplCoord()->setMyLastOptime(time2);
         ASSERT_OK(getReplCoord()->setLastOptime_forTest(client1, time1));
 
         std::vector<HostAndPort> caughtUpHosts = getReplCoord()->getHostsWrittenTo(time2);
@@ -1611,13 +1611,13 @@ namespace {
         ASSERT_OK(handshake.initialize(BSON("handshake" << client)));
         ASSERT_OK(getReplCoord()->processHandshake(&txn, handshake));
 
-        ASSERT_OK(getReplCoord()->setMyLastOptime(&txn, time2));
-        ASSERT_OK(getReplCoord()->setLastOptimeForSlave(&txn, client, time1));
+        getReplCoord()->setMyLastOptime(time2);
+        ASSERT_OK(getReplCoord()->setLastOptimeForSlave(client, time1));
 
         std::vector<HostAndPort> caughtUpHosts = getReplCoord()->getHostsWrittenTo(time2);
         ASSERT_EQUALS(0U, caughtUpHosts.size()); // self doesn't get included in master-slave
 
-        ASSERT_OK(getReplCoord()->setLastOptimeForSlave(&txn, client, time2));
+        ASSERT_OK(getReplCoord()->setLastOptimeForSlave(client, time2));
         caughtUpHosts = getReplCoord()->getHostsWrittenTo(time2);
         ASSERT_EQUALS(1U, caughtUpHosts.size());
         ASSERT_EQUALS(clientHost, caughtUpHosts[0]);
@@ -1750,7 +1750,7 @@ namespace {
                                              BSON("host" << "node5:12345" << "_id" << 4))),
                 HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         OID selfRID = getReplCoord()->getMyRID();
@@ -1761,7 +1761,7 @@ namespace {
         OpTime time1(100, 1);
         OpTime time2(100, 2);
         OpTime staleTime(10, 0);
-        getReplCoord()->setMyLastOptime(&txn, time2);
+        getReplCoord()->setMyLastOptime(time2);
 
         WriteConcernOptions writeConcern;
         writeConcern.wTimeout = WriteConcernOptions::kNoWaiting;
@@ -1775,7 +1775,7 @@ namespace {
                                            BSON("_id" << client2 << "optime" << time1) <<
                                            BSON("_id" << client3 << "optime" << time1)))));
         ASSERT_EQUALS(ErrorCodes::NodeNotFound,
-                      getReplCoord()->processReplSetUpdatePosition(&txn, args));
+                      getReplCoord()->processReplSetUpdatePosition(args));
         ASSERT_EQUALS(ErrorCodes::ExceededTimeLimit,
                       getReplCoord()->awaitReplication(&txn, time1, writeConcern).status);
 
@@ -1785,7 +1785,7 @@ namespace {
         ASSERT_OK(handshake2.initialize(BSON("handshake" << client2 << "member" << 2)));
         ASSERT_OK(getReplCoord()->processHandshake(&txn, handshake2));
         ASSERT_EQUALS(ErrorCodes::NodeNotFound,
-                      getReplCoord()->processReplSetUpdatePosition(&txn, args));
+                      getReplCoord()->processReplSetUpdatePosition(args));
         ASSERT_EQUALS(ErrorCodes::ExceededTimeLimit,
                       getReplCoord()->awaitReplication(&txn, time1, writeConcern).status);
 
@@ -1795,7 +1795,7 @@ namespace {
         ASSERT_OK(handshake1.initialize(BSON("handshake" << client1 << "member" << 1)));
         ASSERT_OK(getReplCoord()->processHandshake(&txn, handshake1));
         ASSERT_EQUALS(ErrorCodes::NodeNotFound,
-                      getReplCoord()->processReplSetUpdatePosition(&txn, args));
+                      getReplCoord()->processReplSetUpdatePosition(args));
         ASSERT_OK(getReplCoord()->awaitReplication(&txn, time1, writeConcern).status);
         writeConcern.wNumNodes = 3;
         ASSERT_OK(getReplCoord()->awaitReplication(&txn, time1, writeConcern).status);
@@ -1816,7 +1816,7 @@ namespace {
                                             BSON("_id" << selfRID << "optime" << staleTime) <<
                                             BSON("_id" << client3 << "optime" << time2) <<
                                             BSON("_id" << client4 << "optime" << time2)))));
-        ASSERT_OK(getReplCoord()->processReplSetUpdatePosition(&txn, args2));
+        ASSERT_OK(getReplCoord()->processReplSetUpdatePosition(args2));
         // all nodes should have through time1 and three should have through time2
         writeConcern.wNumNodes = 5;
         ASSERT_OK(getReplCoord()->awaitReplication(&txn, time1, writeConcern).status);
@@ -1833,7 +1833,7 @@ namespace {
                                             BSON("_id" << client1 << "optime" << time2) <<
                                             BSON("_id" << client2 << "optime" << time2) <<
                                             BSON("_id" << client3 << "optime" << staleTime)))));
-        ASSERT_OK(getReplCoord()->processReplSetUpdatePosition(&txn, args3));
+        ASSERT_OK(getReplCoord()->processReplSetUpdatePosition(args3));
         // all nodes should have through time2
         writeConcern.wNumNodes = 5;
         ASSERT_OK(getReplCoord()->awaitReplication(&txn, time2, writeConcern).status);
@@ -1849,13 +1849,13 @@ namespace {
                                              BSON("host" << "node3:12345" << "_id" << 2))),
                 HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 0));
+        getReplCoord()->setMyLastOptime(OpTime(100, 0));
         simulateSuccessfulElection();
 
         OpTime time1(100, 1);
         OpTime time2(100, 2);
         OpTime staleTime(10, 0);
-        getReplCoord()->setMyLastOptime(&txn, time1);
+        getReplCoord()->setMyLastOptime(time1);
 
         WriteConcernOptions writeConcern;
         writeConcern.wTimeout = WriteConcernOptions::kNoWaiting;
@@ -1872,7 +1872,7 @@ namespace {
                                                 "memberId" << 0 <<
                                                 "optime" << time2)))));
 
-        ASSERT_OK(getReplCoord()->processReplSetUpdatePosition(&txn, args));
+        ASSERT_OK(getReplCoord()->processReplSetUpdatePosition(args));
         ASSERT_EQUALS(ErrorCodes::ExceededTimeLimit,
                       getReplCoord()->awaitReplication(&txn, time2, writeConcern).status);
 
@@ -1885,7 +1885,7 @@ namespace {
                                                  "optime" << time2)))));
 
         ASSERT_EQUALS(ErrorCodes::InvalidReplicaSetConfig,
-                      getReplCoord()->processReplSetUpdatePosition(&txn, args2));
+                      getReplCoord()->processReplSetUpdatePosition(args2));
         ASSERT_EQUALS(ErrorCodes::ExceededTimeLimit,
                       getReplCoord()->awaitReplication(&txn, time2, writeConcern).status);
 
@@ -1898,12 +1898,12 @@ namespace {
                                                  "optime" << time2)))));
 
         ASSERT_EQUALS(ErrorCodes::NodeNotFound,
-                      getReplCoord()->processReplSetUpdatePosition(&txn, args3));
+                      getReplCoord()->processReplSetUpdatePosition(args3));
         ASSERT_EQUALS(ErrorCodes::ExceededTimeLimit,
                       getReplCoord()->awaitReplication(&txn, time2, writeConcern).status);
 
         // receive a good update position
-        getReplCoord()->setMyLastOptime(&txn, time2);
+        getReplCoord()->setMyLastOptime(time2);
         UpdatePositionArgs args4;
         ASSERT_OK(args4.initialize(BSON("replSetUpdatePosition" << 1 <<
                                         "optimes" << BSON_ARRAY(
@@ -1914,7 +1914,7 @@ namespace {
                                                  "memberId" << 2 <<
                                                  "optime" << time2)))));
 
-        ASSERT_OK(getReplCoord()->processReplSetUpdatePosition(&txn, args4));
+        ASSERT_OK(getReplCoord()->processReplSetUpdatePosition(args4));
         ASSERT_OK(getReplCoord()->awaitReplication(&txn, time2, writeConcern).status);
 
         writeConcern.wNumNodes = 3;
@@ -1947,7 +1947,7 @@ namespace {
                                              BSON("host" << "node3:12345" << "_id" << 2))),
                 HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 2));
+        getReplCoord()->setMyLastOptime(OpTime(100, 2));
         simulateSuccessfulElection();
 
         OID selfRID = getReplCoord()->getMyRID();
@@ -2026,7 +2026,7 @@ namespace {
                                              BSON("host" << "node3:12345" << "_id" << 2))),
                 HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 2));
+        getReplCoord()->setMyLastOptime(OpTime(100, 2));
         simulateSuccessfulElection();
 
         OID node2 = OID::gen();
@@ -2091,7 +2091,7 @@ namespace {
                                              BSON("host" << "node5:12345" << "_id" << 4))),
                 HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
-        getReplCoord()->setMyLastOptime(&txn, OpTime(100, 1));
+        getReplCoord()->setMyLastOptime(OpTime(100, 1));
         simulateSuccessfulElection();
 
         OID node2 = OID::gen();
@@ -2171,7 +2171,7 @@ namespace {
                 HostAndPort("node1", 12345));
         ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY));
         OpTime time(100, 0);
-        getReplCoord()->setMyLastOptime(&txn, time);
+        getReplCoord()->setMyLastOptime(time);
         simulateSuccessfulElection();
 
         WriteConcernOptions majorityWriteConcern;
diff --git a/src/mongo/db/repl/repl_coordinator_mock.cpp b/src/mongo/db/repl/repl_coordinator_mock.cpp
index 6cc04de5550..a3a8ff45a9e 100644
--- a/src/mongo/db/repl/repl_coordinator_mock.cpp
+++ b/src/mongo/db/repl/repl_coordinator_mock.cpp
@@ -116,9 +116,7 @@ namespace repl {
         return false;
     }
 
-    Status ReplicationCoordinatorMock::setLastOptimeForSlave(OperationContext* txn,
-                                                             const OID& rid,
-                                                             const OpTime& ts) {
+    Status ReplicationCoordinatorMock::setLastOptimeForSlave(const OID& rid, const OpTime& ts) {
         return Status::OK();
     }
     
@@ -126,9 +124,7 @@ namespace repl {
         // TODO
     }
 
-    Status ReplicationCoordinatorMock::setMyLastOptime(OperationContext* txn, const OpTime& ts) {
-        return Status::OK();
-    }
+    void ReplicationCoordinatorMock::setMyLastOptime(const OpTime& ts) {}
 
     OpTime ReplicationCoordinatorMock::getMyLastOptime() const {
         // TODO
@@ -162,11 +158,9 @@ namespace repl {
     void ReplicationCoordinatorMock::signalUpstreamUpdater() {}
 
     void ReplicationCoordinatorMock::prepareReplSetUpdatePositionCommand(
-            OperationContext* txn,
             BSONObjBuilder* cmdBuilder) {}
 
     void ReplicationCoordinatorMock::prepareReplSetUpdatePositionCommandHandshakes(
-            OperationContext* txn,
             std::vector<BSONObj>* handshakes) {}
 
     void ReplicationCoordinatorMock::processReplSetGetConfig(BSONObjBuilder* result) {
@@ -181,7 +175,7 @@ namespace repl {
 
     void ReplicationCoordinatorMock::appendSlaveInfoData(BSONObjBuilder* result) {}
 
-    Status ReplicationCoordinatorMock::setMaintenanceMode(OperationContext* txn, bool activate) {
+    Status ReplicationCoordinatorMock::setMaintenanceMode(bool activate) {
         return Status::OK();
     }
 
@@ -235,13 +229,12 @@ namespace repl {
     }
 
     Status ReplicationCoordinatorMock::processReplSetUpdatePosition(
-            OperationContext* txn,
             const UpdatePositionArgs& updates) {
         // TODO
         return Status::OK();
     }
 
-    Status ReplicationCoordinatorMock::processHandshake(const OperationContext* txn,
+    Status ReplicationCoordinatorMock::processHandshake(OperationContext* txn,
                                                         const HandshakeArgs& handshake) {
         return Status::OK();
     }
diff --git a/src/mongo/db/repl/repl_coordinator_mock.h b/src/mongo/db/repl/repl_coordinator_mock.h
index 84e43dfab80..59d548410ef 100644
--- a/src/mongo/db/repl/repl_coordinator_mock.h
+++ b/src/mongo/db/repl/repl_coordinator_mock.h
@@ -89,11 +89,9 @@ namespace repl {
 
         virtual bool shouldIgnoreUniqueIndex(const IndexDescriptor* idx);
 
-        virtual Status setLastOptimeForSlave(OperationContext* txn,
-                                             const OID& rid,
-                                             const OpTime& ts);
+        virtual Status setLastOptimeForSlave(const OID& rid, const OpTime& ts);
 
-        virtual Status setMyLastOptime(OperationContext* txn, const OpTime& ts);
+        virtual void setMyLastOptime(const OpTime& ts);
 
         virtual void setMyHeartbeatMessage(const std::string& msg);
 
@@ -113,11 +111,9 @@ namespace repl {
 
         virtual void signalUpstreamUpdater();
 
-        virtual void prepareReplSetUpdatePositionCommand(OperationContext* txn,
-                                                         BSONObjBuilder* cmdBuilder);
+        virtual void prepareReplSetUpdatePositionCommand(BSONObjBuilder* cmdBuilder);
 
         virtual void prepareReplSetUpdatePositionCommandHandshakes(
-                OperationContext* txn,
                 std::vector<BSONObj>* handshakes);
 
         virtual Status processReplSetGetStatus(BSONObjBuilder* result);
@@ -128,7 +124,7 @@ namespace repl {
 
         virtual void processReplSetGetConfig(BSONObjBuilder* result);
 
-        virtual Status setMaintenanceMode(OperationContext* txn, bool activate);
+        virtual Status setMaintenanceMode(bool activate);
 
         virtual bool getMaintenanceMode();
 
@@ -158,11 +154,9 @@ namespace repl {
         virtual Status processReplSetElect(const ReplSetElectArgs& args,
                                            BSONObjBuilder* resultObj);
 
-        virtual Status processReplSetUpdatePosition(OperationContext* txn,
-                                                    const UpdatePositionArgs& updates);
+        virtual Status processReplSetUpdatePosition(const UpdatePositionArgs& updates);
 
-        virtual Status processHandshake(const OperationContext* txn,
-                                        const HandshakeArgs& handshake);
+        virtual Status processHandshake(OperationContext* txn, const HandshakeArgs& handshake);
 
         virtual bool buildsIndexes();
 
diff --git a/src/mongo/db/repl/replset_commands.cpp b/src/mongo/db/repl/replset_commands.cpp
index 23f281a45bb..d64f8deb2bc 100644
--- a/src/mongo/db/repl/replset_commands.cpp
+++ b/src/mongo/db/repl/replset_commands.cpp
@@ -456,7 +456,6 @@ namespace {
             return appendCommandStatus(
                     result,
                     getGlobalReplicationCoordinator()->setMaintenanceMode(
-                            txn,
                             cmdObj["replSetMaintenance"].trueValue()));
         }
     } cmdReplSetMaintenance;
@@ -544,7 +543,7 @@ namespace {
             
             return appendCommandStatus(
                     result,
-                    getGlobalReplicationCoordinator()->processReplSetUpdatePosition(txn, args));
+                    getGlobalReplicationCoordinator()->processReplSetUpdatePosition(args));
                     
         }
     } cmdReplSetUpdatePosition;
diff --git a/src/mongo/db/repl/rs_initialsync.cpp b/src/mongo/db/repl/rs_initialsync.cpp
index 5fbdd80b2cf..098a0e7c4e1 100644
--- a/src/mongo/db/repl/rs_initialsync.cpp
+++ b/src/mongo/db/repl/rs_initialsync.cpp
@@ -72,7 +72,7 @@ namespace {
         // via stop().
         // We must clear the sync source blacklist after calling stop()
         // because the bgsync thread, while running, may update the blacklist.
-        replCoord->setMyLastOptime(txn, OpTime());
+        replCoord->setMyLastOptime(OpTime());
         bgsync->stop();
         replCoord->clearSyncSourceBlacklist();
 
@@ -184,7 +184,7 @@ namespace {
         catch (const DBException&) {
             log() << "replSet initial sync failed during oplog application phase, and will retry";
 
-            getGlobalReplicationCoordinator()->setMyLastOptime(ctx, OpTime());
+            getGlobalReplicationCoordinator()->setMyLastOptime(OpTime());
             BackgroundSync::get()->setLastAppliedHash(0);
 
             sleepsecs(5);
diff --git a/src/mongo/db/repl/sync_source_feedback.cpp b/src/mongo/db/repl/sync_source_feedback.cpp
index 0ee2984e23f..459e5d91962 100644
--- a/src/mongo/db/repl/sync_source_feedback.cpp
+++ b/src/mongo/db/repl/sync_source_feedback.cpp
@@ -112,7 +112,7 @@ namespace repl {
         }
         // construct a vector of handshake obj for us as well as all chained members
         std::vector<BSONObj> handshakeObjs;
-        replCoord->prepareReplSetUpdatePositionCommandHandshakes(txn, &handshakeObjs);
+        replCoord->prepareReplSetUpdatePositionCommandHandshakes(&handshakeObjs);
         LOG(1) << "handshaking upstream updater";
         for (std::vector<BSONObj>::iterator it = handshakeObjs.begin();
                 it != handshakeObjs.end();
@@ -205,7 +205,7 @@ namespace repl {
                 return Status(ErrorCodes::NodeNotFound,
                               "Need to send handshake before updating position upstream");
             }
-            replCoord->prepareReplSetUpdatePositionCommand(txn, &cmd);
+            replCoord->prepareReplSetUpdatePositionCommand(&cmd);
         }
         BSONObj res;