SERVER-18584 write an n-op when transition to primary is complete

1 files changed, 6 insertions, 1 deletions

diff --git a/jstests/replsets/chaining_removal.js b/jstests/replsets/chaining_removal.js
index 2175c8d72cd..76f8a6b4338 100644
--- a/jstests/replsets/chaining_removal.js
+++ b/jstests/replsets/chaining_removal.js
@@ -20,11 +20,15 @@
             });
     var primary = replTest.getPrimary();
     // force node 4 to chain through node 1
+    replTest.awaitReplication();
     assert.commandWorked(nodes[4].getDB("admin").runCommand({"replSetSyncFrom": nodes[1].host}));
+    assert.commandWorked(nodes[1].getDB("admin").runCommand({"replSetSyncFrom": nodes[0].host}));
     var res;
+    var res2;
     assert.soon(function() {
         res = nodes[4].getDB("admin").runCommand({"replSetGetStatus": 1});
-        return res.syncingTo === nodes[1].host;
+        res2 = nodes[1].getDB("admin").runCommand({"replSetGetStatus": 1});
+        return res.syncingTo === nodes[1].host && res2.syncingTo === nodes[0].host;
     }, "node 4 failed to start chaining: "+ tojson(res));
 
     // write that should reach all nodes
@@ -46,6 +50,7 @@
 
     // ensure writing to all four nodes still works
     primary = replTest.getPrimary();
+    replTest.awaitReplication();
     options.writeConcern.w = 4;
     assert.writeOK(primary.getDB(name).foo.insert({x: 2}, options));