SERVER-29153 Wait for nodes to agree on primary before writes in ShardingTest setup

(cherry picked from commit 85a915d3b49c0cd0b106f40df55a68a2f6779de1)

1 files changed, 2 insertions, 0 deletions

diff --git a/src/mongo/shell/shardingtest.js b/src/mongo/shell/shardingtest.js
index 2e5a10c3062..dab5a98b4e2 100644
--- a/src/mongo/shell/shardingtest.js
+++ b/src/mongo/shell/shardingtest.js
@@ -1371,6 +1371,7 @@ var ShardingTest = function(params) {
         }
 
         var rs = this._rs[i].test;
+        rs.awaitNodesAgreeOnPrimary();
         rs.getPrimary().getDB("admin").foo.save({x: 1});
 
         if (keyFile) {
@@ -1438,6 +1439,7 @@ var ShardingTest = function(params) {
     this.configRS.initiateWithAnyNodeAsPrimary(config);
 
     // Wait for master to be elected before starting mongos
+    this.configRS.awaitNodesAgreeOnPrimary();
     var csrsPrimary = this.configRS.getPrimary();
 
     // If 'otherParams.mongosOptions.binVersion' is an array value, then we'll end up constructing a