SERVER-8070 more reliable test (failpoint was not in the right place)

2 files changed, 9 insertions, 9 deletions

diff --git a/jstests/replsets/server8070.js b/jstests/replsets/server8070.js
index 9bea515e996..8b28cc2fc90 100644
--- a/jstests/replsets/server8070.js
+++ b/jstests/replsets/server8070.js
@@ -83,7 +83,7 @@ for (var i = 50; i < 75; i++) {
 var last = primary.getSisterDB("local").oplog.rs.find().sort({$natural:-1}).limit(1).next();
 
 print("waiting a bit for the secondaries to get the write");
-sleep(20000);
+sleep(10000);
 
 print("Shut down the primary");
 replSet.stop(0);
@@ -125,8 +125,8 @@ assert.soon(
     function() {
         var last3 = member3.getSisterDB("local").oplog.rs.find().sort({$natural:-1}).limit(1)
             .next();
-        print("primary: " + last.ts.t + " secondary: " + last3.ts.t);
-        return last.ts.t == last3.ts.t;
+        print("primary: " + tojson(last.ts) + " secondary: " + tojson(last3.ts));
+        return ((last.ts.t === last3.ts.t) && (last.ts.i === last3.ts.i))
     }
 );
 
@@ -134,10 +134,10 @@ print(" --- start 3's bgsync thread ---");
 member3.runCommand({configureFailPoint: 'rsBgSyncProduce', mode: 'off'});
 
 print("Shouldn't hit rollback");
-var end = (new Date()).getTime()+30000;
+var end = (new Date()).getTime()+10000;
 while ((new Date()).getTime() < end) {
     assert('ROLLBACK' != member3.runCommand({replSetGetStatus:1}).members[2].stateStr);
-    sleep(1000);
+    sleep(30);
 }
 
 replSet.stopSet();
diff --git a/src/mongo/db/repl/bgsync.cpp b/src/mongo/db/repl/bgsync.cpp
index 626a575afae..67c1eca8555 100644
--- a/src/mongo/db/repl/bgsync.cpp
+++ b/src/mongo/db/repl/bgsync.cpp
@@ -312,10 +312,6 @@ namespace replset {
             return;
         }
 
-        while (MONGO_FAIL_POINT(rsBgSyncProduce)) {
-            sleepmillis(0);
-        }
-
         uassert(1000, "replSet source for syncing doesn't seem to be await capable -- is it an older version of mongodb?", r.awaitCapable() );
 
         if (isRollbackRequired(r)) {
@@ -472,6 +468,10 @@ namespace replset {
             }
         }
 
+        while (MONGO_FAIL_POINT(rsBgSyncProduce)) {
+            sleepmillis(0);
+        }
+
         verify(r.conn() == NULL);
 
         while ((target = theReplSet->getMemberToSyncTo()) != NULL) {