SERVER-46944 Re-enable tests on sharding_last_stable_mongos_and_mixed_shards and sharding_multiversion suite

22 files changed, 51 insertions, 23 deletions

diff --git a/buildscripts/resmokeconfig/suites/sharding_multiversion.yml b/buildscripts/resmokeconfig/suites/sharding_multiversion.yml
index 434f41bbb46..14429fd413c 100644
--- a/buildscripts/resmokeconfig/suites/sharding_multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_multiversion.yml
@@ -8,6 +8,7 @@ selector:
   exclude_with_any_tags:
   - multiversion_incompatible
   - requires_fcv_46
+  - need_fixing_for_46
   exclude_files:
   # Enable when 4.4 becomes last stable
   - jstests/sharding/killop.js
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 7534b93464d..4ed061500de 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -7049,7 +7049,7 @@ tasks:
       fallback_num_sub_suites: 32
 
 - name: sharding_multiversion_gen
-# tags: ["random_multiversion_ds"]
+  tags: ["random_multiversion_ds"]
   commands:
   - func: "generate randomized multiversion tasks"
     vars:
@@ -7145,16 +7145,15 @@ tasks:
       resmoke_args: --storageEngine=wiredTiger
       fallback_num_sub_suites: 31
 
-# TODO SERVER-47147: Enable this suite when FCV is bumped to 4.6
-#- name: sharding_last_stable_mongos_and_mixed_shards_gen
-#  tags: ["sharding", "common", "multiversion"]
-#  commands:
-#  - func: "generate resmoke tasks"
-#    vars:
-#      use_large_distro: "true"
-#      use_multiversion: /data/multiversion
-#      resmoke_args: ""
-#      fallback_num_sub_suites: 24
+- name: sharding_last_stable_mongos_and_mixed_shards_gen
+  tags: ["sharding", "common", "multiversion"]
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      use_large_distro: "true"
+      use_multiversion: /data/multiversion
+      resmoke_args: ""
+      fallback_num_sub_suites: 24
 
 - <<: *task_template
   name: snmp
diff --git a/jstests/core/remove2.js b/jstests/core/remove2.js
index d01c1e2e58c..a952a423f71 100644
--- a/jstests/core/remove2.js
+++ b/jstests/core/remove2.js
@@ -1,4 +1,4 @@
-// @tags: [requires_non_retryable_writes]
+// @tags: [requires_non_retryable_writes, need_fixing_for_46]
 
 // remove2.js
 // a unit test for db remove
diff --git a/jstests/sharding/hash_shard_unique_compound.js b/jstests/sharding/hash_shard_unique_compound.js
index 056bf2bdbca..1b069a94181 100644
--- a/jstests/sharding/hash_shard_unique_compound.js
+++ b/jstests/sharding/hash_shard_unique_compound.js
@@ -5,7 +5,10 @@
 
 // This test triggers a compiler bug that causes a crash when compiling with optimizations on, see
 // SERVER-36321.
-// @tags: [blacklist_from_rhel_67_s390x]
+// @tags: [
+//   blacklist_from_rhel_67_s390x,
+//   need_fixing_for_46
+// ]
 (function() {
 'use strict';
 
diff --git a/jstests/sharding/index_commands_shard_targeting.js b/jstests/sharding/index_commands_shard_targeting.js
index bc25983780c..d60bdb0d48f 100644
--- a/jstests/sharding/index_commands_shard_targeting.js
+++ b/jstests/sharding/index_commands_shard_targeting.js
@@ -2,6 +2,7 @@
  * Test that the index commands send and check shard versions, and only target the shards
  * that have chunks for the collection. Also test that the commands fail if they are run
  * when the critical section is in progress, and block until the critical section is over.
+ * @tags: [need_fixing_for_46]
  */
 (function() {
 "use strict";
diff --git a/jstests/sharding/mongos_get_shard_version.js b/jstests/sharding/mongos_get_shard_version.js
index 0f864aebec4..e250e259df4 100644
--- a/jstests/sharding/mongos_get_shard_version.js
+++ b/jstests/sharding/mongos_get_shard_version.js
@@ -1,7 +1,5 @@
 /**
  * Test that mongos getShardVersion returns the correct version and chunks.
- *
- * @tags: [need_fixing_for_46]
  */
 (function() {
 'use strict';
diff --git a/jstests/sharding/move_chunk_critical_section_non_internal_client_abort.js b/jstests/sharding/move_chunk_critical_section_non_internal_client_abort.js
index 0ecdee3bf41..e2ace6c841b 100644
--- a/jstests/sharding/move_chunk_critical_section_non_internal_client_abort.js
+++ b/jstests/sharding/move_chunk_critical_section_non_internal_client_abort.js
@@ -1,6 +1,8 @@
 /**
  * Tests that a moveChunk operation is properly aborted when an index command is received from a
  * non-internal client while in the critical section.
+ *
+ * @tags: [need_fixing_for_46]
  */
 (function() {
 "use strict";
diff --git a/jstests/sharding/query/lookup_mongod_unaware.js b/jstests/sharding/query/lookup_mongod_unaware.js
index ac9360fab04..c7f201d58a9 100644
--- a/jstests/sharding/query/lookup_mongod_unaware.js
+++ b/jstests/sharding/query/lookup_mongod_unaware.js
@@ -4,7 +4,10 @@
 //
 // We restart a mongod to cause it to forget that a collection was sharded. When restarted, we
 // expect it to still have all the previous data.
-// @tags: [requires_persistence]
+// @tags: [
+//   requires_persistence,
+//   need_fixing_for_46
+// ]
 (function() {
 "use strict";
 
diff --git a/jstests/sharding/read_committed_lookup.js b/jstests/sharding/read_committed_lookup.js
index 2f9302dc86b..72046bbf260 100644
--- a/jstests/sharding/read_committed_lookup.js
+++ b/jstests/sharding/read_committed_lookup.js
@@ -1,7 +1,6 @@
 /**
  * Tests that a $lookup and $graphLookup stage within an aggregation pipeline will read only
  * committed data if the pipeline is using a majority readConcern.
- * @tags: [need_fixing_for_46]
  */
 
 load("jstests/replsets/rslib.js");           // For startSetIfSupportsReadMajority.
diff --git a/jstests/sharding/read_write_concern_defaults_application.js b/jstests/sharding/read_write_concern_defaults_application.js
index fe76013bd64..721c9d3b73e 100644
--- a/jstests/sharding/read_write_concern_defaults_application.js
+++ b/jstests/sharding/read_write_concern_defaults_application.js
@@ -26,6 +26,7 @@
  *   requires_majority_read_concern,
  *   requires_profiling,
  *   uses_transactions,
+ *   need_fixing_for_46
  * ]
  */
 (function() {
diff --git a/jstests/sharding/retryable_write_error_labels.js b/jstests/sharding/retryable_write_error_labels.js
index 51912eeb60b..89e2ca5645f 100644
--- a/jstests/sharding/retryable_write_error_labels.js
+++ b/jstests/sharding/retryable_write_error_labels.js
@@ -7,6 +7,7 @@
  * @tags: [
  *   requires_find_command,
  *   uses_transactions,
+ *   need_fixing_for_46
  * ]
  */
 
diff --git a/jstests/sharding/sharding_rs1.js b/jstests/sharding/sharding_rs1.js
index cdd07c8e430..d15f97bafd6 100644
--- a/jstests/sharding/sharding_rs1.js
+++ b/jstests/sharding/sharding_rs1.js
@@ -1,6 +1,5 @@
 /**
  * tests sharding with replica sets
- * @tags: [need_fixing_for_46]
  */
 (function() {
 'use strict';
diff --git a/jstests/sharding/sharding_rs2.js b/jstests/sharding/sharding_rs2.js
index bbb27f6d333..8311ad6f954 100644
--- a/jstests/sharding/sharding_rs2.js
+++ b/jstests/sharding/sharding_rs2.js
@@ -7,8 +7,7 @@
 // This test involves using fsync to lock the secondaries, so cannot be run on
 // storage engines which do not support the command.
 // @tags: [
-//    requires_fsync,
-//    need_fixing_for_46,
+//    requires_fsync
 // ]
 
 (function() {
diff --git a/jstests/sharding/single_shard_transaction_without_majority_reads_lagged.js b/jstests/sharding/single_shard_transaction_without_majority_reads_lagged.js
index d4daf46e5a7..df6cabbd0d3 100644
--- a/jstests/sharding/single_shard_transaction_without_majority_reads_lagged.js
+++ b/jstests/sharding/single_shard_transaction_without_majority_reads_lagged.js
@@ -10,7 +10,11 @@
  * needs to pick a read timestamp that is not derived from the commit point, but rather from the
  * 'lastApplied' optime on the primary.
  *
- * @tags: [uses_transactions, requires_find_command]
+ * @tags: [
+ *   uses_transactions,
+ *   requires_find_command,
+ *   need_fixing_for_46
+ * ]
  */
 
 (function() {
diff --git a/jstests/sharding/stale_mongos_and_restarted_shards_agree_on_shard_version.js b/jstests/sharding/stale_mongos_and_restarted_shards_agree_on_shard_version.js
index 4d357922b58..ef9cfe0701c 100644
--- a/jstests/sharding/stale_mongos_and_restarted_shards_agree_on_shard_version.js
+++ b/jstests/sharding/stale_mongos_and_restarted_shards_agree_on_shard_version.js
@@ -5,7 +5,10 @@
  * This test requrires persistence because it asumes the shard will still have it's data after
  * restarting
  *
- * @tags: [requires_persistence]
+ * @tags: [
+ *   requires_persistence,
+ *   need_fixing_for_46
+ * ]
  */
 (function() {
 'use strict';
diff --git a/jstests/sharding/transactions_multi_writes.js b/jstests/sharding/transactions_multi_writes.js
index 2692e9e0682..d784dacea63 100644
--- a/jstests/sharding/transactions_multi_writes.js
+++ b/jstests/sharding/transactions_multi_writes.js
@@ -5,6 +5,7 @@
 //   requires_sharding,
 //   uses_multi_shard_transaction,
 //   uses_transactions,
+//   need_fixing_for_46
 // ]
 (function() {
 "use strict";
diff --git a/jstests/sharding/transactions_view_resolution.js b/jstests/sharding/transactions_view_resolution.js
index 25e4c083e55..ea258c5f705 100644
--- a/jstests/sharding/transactions_view_resolution.js
+++ b/jstests/sharding/transactions_view_resolution.js
@@ -5,6 +5,7 @@
 //   requires_sharding,
 //   uses_multi_shard_transaction,
 //   uses_transactions,
+//   need_fixing_for_46
 // ]
 (function() {
 "use strict";
diff --git a/jstests/sharding/transient_txn_error_labels_with_write_concern.js b/jstests/sharding/transient_txn_error_labels_with_write_concern.js
index 5838db045fa..4e2f2403dce 100644
--- a/jstests/sharding/transient_txn_error_labels_with_write_concern.js
+++ b/jstests/sharding/transient_txn_error_labels_with_write_concern.js
@@ -2,6 +2,7 @@
  * Test TransientTransactionError error label for commands in transactions with write concern.
  * @tags: [
  *   uses_transactions,
+ *   need_fixing_for_46
  * ]
  */
 (function() {
diff --git a/jstests/sharding/update_compound_shard_key.js b/jstests/sharding/update_compound_shard_key.js
index 873988d7cd1..bf84e4179e1 100644
--- a/jstests/sharding/update_compound_shard_key.js
+++ b/jstests/sharding/update_compound_shard_key.js
@@ -8,6 +8,7 @@
  *   requires_find_command,
  *   uses_multi_shard_transaction,
  *   uses_transactions,
+ *   need_fixing_for_46
  * ]
  */
 (function() {
diff --git a/jstests/sharding/update_shard_key_conflicting_writes.js b/jstests/sharding/update_shard_key_conflicting_writes.js
index 101f8970111..a22c21b1ca6 100644
--- a/jstests/sharding/update_shard_key_conflicting_writes.js
+++ b/jstests/sharding/update_shard_key_conflicting_writes.js
@@ -5,7 +5,12 @@
  * Use the 'requires_find_command' tag to skip this test in sharding_op_query suite. Otherwise,
  * sessionDB.coll.find() will throw "Cannot run a legacy query on a session".
  *
- * @tags: [requires_find_command, uses_transactions, uses_multi_shard_transaction]
+ * @tags: [
+ *   requires_find_command,
+ *   uses_transactions,
+ *   uses_multi_shard_transaction,
+ *   need_fixing_for_46
+ * ]
  */
 
 (function() {
diff --git a/jstests/sharding/update_sharded.js b/jstests/sharding/update_sharded.js
index da447f3c8b8..4a86489783a 100644
--- a/jstests/sharding/update_sharded.js
+++ b/jstests/sharding/update_sharded.js
@@ -9,6 +9,7 @@
 //   requires_find_command,
 //   uses_multi_shard_transaction,
 //   uses_transactions,
+//   need_fixing_for_46
 // ]
 (function() {
 
diff --git a/jstests/sharding/version2.js b/jstests/sharding/version2.js
index 74880d8ccfd..ec6f45cd6a1 100644
--- a/jstests/sharding/version2.js
+++ b/jstests/sharding/version2.js
@@ -1,3 +1,8 @@
+/**
+ * @tags: [
+ *   need_fixing_for_46
+ * ]
+ */
 (function() {
 'use strict';