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

3 files changed, 31 insertions, 4 deletions

diff --git a/jstests/sharding/shard_aware_init.js b/jstests/sharding/shard_aware_init.js
index a5ae740b891..d6e27c7297c 100644
--- a/jstests/sharding/shard_aware_init.js
+++ b/jstests/sharding/shard_aware_init.js
@@ -60,8 +60,17 @@
             return mongodConn;
         };
 
+        // 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(mongodConn.getDB('admin').system.version.update(
-            {_id: 'shardIdentity'}, shardIdentityDoc, true));
+            shardIdentityQuery, shardIdentityUpdate, {upsert: true}));
 
         var res = mongodConn.getDB('admin').runCommand({shardingState: 1});
 
diff --git a/jstests/sharding/shard_aware_init_secondaries.js b/jstests/sharding/shard_aware_init_secondaries.js
index 8d58c199637..d8407a3a846 100644
--- a/jstests/sharding/shard_aware_init_secondaries.js
+++ b/jstests/sharding/shard_aware_init_secondaries.js
@@ -28,8 +28,17 @@
         clusterId: ObjectId()
     };
 
+    // 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(priConn.getDB('admin').system.version.update(
-        {_id: 'shardIdentity'}, shardIdentityDoc, {upsert: true, writeConcern: {w: 2}}));
+        shardIdentityQuery, shardIdentityUpdate, {upsert: true, writeConcern: {w: 2}}));
 
     var secConn = replTest.getSecondary();
     secConn.setSlaveOk(true);
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();