SERVER-24463 make upsert commands in shard_aware*.js tests mimic the command sent by the config server

1 files changed, 11 insertions, 2 deletions

diff --git a/jstests/sharding/shard_aware_primary_failover.js b/jstests/sharding/shard_aware_primary_failover.js
index 127e74b948c..934d4dc5600 100644
--- a/jstests/sharding/shard_aware_primary_failover.js
+++ b/jstests/sharding/shard_aware_primary_failover.js
@@ -29,8 +29,17 @@
         clusterId: ObjectId()
     };
 
-    assert.writeOK(primaryConn.getDB('admin').system.version.insert(
-        shardIdentityDoc, {writeConcern: {w: 'majority'}}));
+    // Simulate the upsert that is performed by a config server on addShard.
+    var shardIdentityQuery = {
+        _id: shardIdentityDoc._id,
+        shardName: shardIdentityDoc.shardName,
+        clusterId: shardIdentityDoc.clusterId
+    };
+    var shardIdentityUpdate = {
+        $set: {configsvrConnectionString: shardIdentityDoc.configsvrConnectionString}
+    };
+    assert.writeOK(primaryConn.getDB('admin').system.version.update(
+        shardIdentityQuery, shardIdentityUpdate, {upsert: true, writeConcern: {w: 'majority'}}));
 
     replTest.stopMaster();
     replTest.waitForMaster();