Revert "SERVER-44598 Shards do not treat the IGNORED version as "intended sharded""

This reverts commit f2eee7f4879a0dda72b281c8d1d25f2afc4c5eb7.

3 files changed, 17 insertions, 72 deletions

diff --git a/jstests/readonly/write_ops.js b/jstests/readonly/write_ops.js
index 03740041abc..a5d43077cbc 100644
--- a/jstests/readonly/write_ops.js
+++ b/jstests/readonly/write_ops.js
@@ -1,8 +1,5 @@
 load("jstests/readonly/lib/read_only_test.js");
-/*
- * TODO SERVER-45483: The write command should only be returning an
- * IlegalOperation
- */
+
 runReadOnlyTest(function() {
     'use strict';
     return {
@@ -14,19 +11,19 @@ runReadOnlyTest(function() {
             // Test that insert fails.
             assert.writeErrorWithCode(
                 readableCollection.insert({x: 2}),
-                [ErrorCodes.IllegalOperation, ErrorCodes.MultipleErrorsOccurred],
+                ErrorCodes.IllegalOperation,
                 "Expected insert to fail because database is in read-only mode");
 
             // Test that delete fails.
             assert.writeErrorWithCode(
                 readableCollection.remove({x: 1}),
-                [ErrorCodes.IllegalOperation, ErrorCodes.MultipleErrorsOccurred],
+                ErrorCodes.IllegalOperation,
                 "Expected remove to fail because database is in read-only mode");
 
             // Test that update fails.
             assert.writeErrorWithCode(
                 readableCollection.update({_id: 0}, {$inc: {x: 1}}),
-                [ErrorCodes.IllegalOperation, ErrorCodes.MultipleErrorsOccurred],
+                ErrorCodes.IllegalOperation,
                 "Expected update to fail because database is in read-only mode");
         }
     };
diff --git a/jstests/sharding/change_streams_update_lookup_shard_metadata_missing.js b/jstests/sharding/change_streams_update_lookup_shard_metadata_missing.js
index 7b37c80d0bf..7e35b201438 100644
--- a/jstests/sharding/change_streams_update_lookup_shard_metadata_missing.js
+++ b/jstests/sharding/change_streams_update_lookup_shard_metadata_missing.js
@@ -1,7 +1,8 @@
 /**
- * Tests that an updateLookup change stream doesn't throw ChangeStreamFatalError after
- * fixing SERVER-44598
- *
+ * Tests that an updateLookup change stream throws ChangeStreamFatalError when it encounters an
+ * oplog entry whose documentKey omits the shard key.
+ * TODO SERVER-44598: the oplog entry will no longer omit the shard key when SERVER-44598 is fixed,
+ * and so this test will no longer be relevant.
  * @tags: [uses_change_streams]
  */
 (function() {
@@ -38,26 +39,12 @@
 
     const resumeToken = csCursor.next()._id;
 
-    // get any secondary
-    const newPrimary = st.rs0.getSecondary();
-    let shards = st.s.getDB('config').shards.find().toArray();
-
     // Step up one of the Secondaries, which will not have any sharding metadata loaded.
-    st.rs0.stepUpNoAwaitReplication(newPrimary);
-
-    // make sure the mongos refreshes it's connections to the shard
-    let primary = {};
-    do {
-        let connPoolStats = st.s0.adminCommand({connPoolStats: 1});
-        primary = connPoolStats.replicaSets[shards[0]._id].hosts.find((host) => {
-            return host.ismaster;
-        }) ||
-            {};
-    } while (newPrimary.host !== primary.addr);
+    shard0.stepUpNoAwaitReplication(shard0.getSecondary());
 
     // Do a {multi:true} update. This will scatter to all shards and update the document on shard0.
-    // Because no metadata is loaded, the shard will return a StaleShardVersion and fetch it,
-    // the operation will be retried
+    // Because no metadata is loaded, this will write the update into the oplog with a documentKey
+    // containing only the _id field.
     assert.soonNoExcept(() => assert.commandWorked(
                             mongosColl.update({_id: 0}, {$set: {updated: true}}, false, true)));
 
@@ -67,11 +54,12 @@
         cursor: {}
     }));
 
-    assert.soon(() => csCursor.hasNext());
-
-    const updateObj = csCursor.next();
-
-    assert.eq(true, updateObj.updateDescription.updatedFields.updated);
+    // Begin pulling from the stream. We should hit a ChangeStreamFatalError when the updateLookup
+    // attempts to read the update entry that is missing the shard key value of the document.
+    assert.soonNoExcept(
+        () => assert.commandFailedWithCode(
+            mongosColl.runCommand({getMore: cmdRes.cursor.id, collection: mongosColl.getName()}),
+            ErrorCodes.ChangeStreamFatalError));
 
     st.stop();
 })();
\ No newline at end of file
diff --git a/jstests/sharding/ssv_after_restart_of_shards_and_mongos_workarround.js b/jstests/sharding/ssv_after_restart_of_shards_and_mongos_workarround.js
deleted file mode 100644
index 3947c38f048..00000000000
--- a/jstests/sharding/ssv_after_restart_of_shards_and_mongos_workarround.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Tests that after a restart on a shard a multi-write operation will not be repeated
- *
- * This test requrires persistence because it asumes the shard will still have it's
- * data after restarting
- *
- * @tags: [requires_persistence]
- */
-(function() {
-    'use strict';
-    var st = new ShardingTest({shards: 2, mongos: 1});
-
-    st.enableSharding('TestDB');
-    st.ensurePrimaryShard('TestDB', st.rs1.getURL());
-
-    // Hash shard the collection so that the chunks are placed uniformly across the shards from the
-    // beginning (because the collection is empty)
-    st.shardCollection('TestDB.TestColl', {Key: 'hashed'}, false, {numInitialChunks: 120});
-    // Helper function to restart a node and wait that the entire set is operational
-
-    // Insert a document outside the shard key range so the update below will generate a scather-
-    // gather write operation
-    st.s0.getDB('TestDB').TestColl.insert({Key: null, X: 'Key 0', inc: 0});
-
-    // Restart shard 0, given the fact that the ssv flag is true, then
-    // mongos should send the info only once
-
-    st.restartShardRS(0);
-
-    // Do a scather-gather write operation. One of the shards have been restarted
-    // so StaleShardVersion should be returned, and the multi-write should be
-    // executed only once per shard
-    var bulkOp = st.s0.getDB('TestDB').TestColl.initializeUnorderedBulkOp();
-    bulkOp.find({X: 'Key 0'}).update({$inc: {inc: 1}});
-    bulkOp.execute();
-
-    // Make sure inc have been incremented only 1 time
-    assert.eq(1, st.s0.getDB('TestDB').TestColl.findOne({X: 'Key 0'}).inc);
-    st.stop();
-})();