SERVER-15704, SERVER-17071: Use resetMyLastApplied and re-enable resync.js

Author: scotthernandez

jstests/replsets/resync.js

@@ -1,8 +1,8 @@
 // test that the resync command works with replica sets and that one does not need to manually
 // force a replica set resync by deleting all datafiles
-
-// TODO: Remove once test is fixed for SERVER-15704, add "use strict"
-if (false) {
+// Also tests that you can do this from a node that is "too stale"
+(function() {
+    "use strict";
     var replTest = new ReplSetTest({name: 'resync', nodes: 3, oplogSize: 1});
     var nodes = replTest.nodeList();
 
@@ -29,17 +29,27 @@ if (false) {
 
     // create an oplog entry with an insert
     assert.writeOK( A.foo.insert({ x: 1 }, { writeConcern: { w: 3, wtimeout: 60000 }}));
+    assert.eq(B.foo.findOne().x, 1)
+    
+    // run resync and wait for it to happen
+    assert.commandWorked(b_conn.getDB("admin").runCommand({resync:1}));
+    replTest.awaitReplication();
+    replTest.awaitSecondaryNodes();
+    
+    assert.eq(B.foo.findOne().x, 1)
     replTest.stop(BID);
 
     function hasCycled() {
         var oplog = a_conn.getDB("local").oplog.rs;
-        return oplog.find( { "o.x" : 1 } ).sort( { $natural : 1 } )._addSpecial( "$maxScan" , 10 ).itcount() == 0;
+        return oplog.find( { "o.x" : 1 } ).sort( { $natural : 1 } ).limit(10).itcount() == 0;
     }
 
+    // Make sure the oplog has rolled over on the primary and secondary that is up, 
+    // so when we bring up the other replica it is "too stale"
     for ( var cycleNumber = 0; cycleNumber < 10; cycleNumber++ ) {
         // insert enough to cycle oplog
         var bulk = A.foo.initializeUnorderedBulkOp();
-        for (i=2; i < 10000; i++) {
+        for (var i=2; i < 10000; i++) {
             bulk.insert({x:i});
         }
 
@@ -52,10 +62,9 @@ if (false) {
 
     assert( hasCycled() );
 
-
-
     // bring node B and it will enter recovery mode because its newest oplog entry is too old
     replTest.restart(BID);
+    
     // check that it is in recovery mode
     assert.soon(function() {
         try {
@@ -71,6 +80,8 @@ if (false) {
     assert.commandWorked(b_conn.getDB("admin").runCommand({resync:1}));
     replTest.awaitReplication();
     replTest.awaitSecondaryNodes();
+    assert.eq(B.foo.findOne().x, 1)
 
     replTest.stopSet(15);
-}
+    jsTest.log("success");
+})();

src/mongo/db/repl/replication_coordinator.h

@@ -257,6 +257,11 @@ namespace repl {
          */
         virtual void setMyLastOptime(const OpTime& ts) = 0;
 
+        /**
+         * Same as above, but used during places we need to zero our last optime.
+         */
+        virtual void resetMyLastOptime() = 0;
+
         /**
          * Updates our the message we include in heartbeat responses.
          */

src/mongo/db/repl/replication_coordinator_impl.cpp

@@ -686,6 +686,11 @@ namespace {
         _setMyLastOptime_inlock(&lock, ts, false);
     }
 
+    void ReplicationCoordinatorImpl::resetMyLastOptime() {
+        boost::unique_lock<boost::mutex> lock(_mutex);
+        _setMyLastOptime_inlock(&lock, OpTime(), true);
+    }
+
     void ReplicationCoordinatorImpl::_setMyLastOptime_inlock(
             boost::unique_lock<boost::mutex>* lock, const OpTime& ts, bool isRollbackAllowed) {
         invariant(lock->owns_lock());

src/mongo/db/repl/replication_coordinator_impl.h

@@ -137,6 +137,8 @@ namespace repl {
 
         virtual void setMyLastOptime(const OpTime& ts);
 
+        virtual void resetMyLastOptime();
+
         virtual void setMyHeartbeatMessage(const std::string& msg);
 
         virtual OpTime getMyLastOptime() const;

src/mongo/db/repl/replication_coordinator_mock.cpp

@@ -132,6 +132,8 @@ namespace repl {
 
     void ReplicationCoordinatorMock::setMyLastOptime(const OpTime& ts) {}
 
+    void ReplicationCoordinatorMock::resetMyLastOptime() {}
+
     OpTime ReplicationCoordinatorMock::getMyLastOptime() const {
         // TODO
         return OpTime();

src/mongo/db/repl/replication_coordinator_mock.h

@@ -95,6 +95,8 @@ namespace repl {
 
         virtual void setMyLastOptime(const OpTime& ts);
 
+        virtual void resetMyLastOptime();
+
         virtual void setMyHeartbeatMessage(const std::string& msg);
 
         virtual OpTime getMyLastOptime() const;

src/mongo/db/repl/rs_initialsync.cpp

@@ -78,7 +78,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(OpTime());
+        replCoord->resetMyLastOptime();
         bgsync->stop();
         replCoord->clearSyncSourceBlacklist();
 
@@ -194,7 +194,7 @@ namespace {
         catch (const DBException&) {
             log() << "replSet initial sync failed during oplog application phase, and will retry";
 
-            getGlobalReplicationCoordinator()->setMyLastOptime(OpTime());
+            getGlobalReplicationCoordinator()->resetMyLastOptime();
             BackgroundSync::get()->setLastAppliedHash(0);
 
             sleepsecs(5);