SERVER-58296 re-enabled tests and marked node_restarts_no_oplog_entry_at_stable.js as multiversion_incompatible

14 files changed, 29 insertions, 26 deletions

diff --git a/jstests/multiVersion/genericSetFCVUsage/feature_compatibility_version_lagging_secondary.js b/jstests/multiVersion/genericSetFCVUsage/feature_compatibility_version_lagging_secondary.js
index 4d9ba76eea9..48285f2f4fe 100644
--- a/jstests/multiVersion/genericSetFCVUsage/feature_compatibility_version_lagging_secondary.js
+++ b/jstests/multiVersion/genericSetFCVUsage/feature_compatibility_version_lagging_secondary.js
@@ -1,7 +1,5 @@
 // Tests that a primary with upgrade featureCompatibilityVersion cannot connect with a secondary
 // with a lower binary version.
-//
-// @tags: [disabled_due_to_server_58295]
 (function() {
 "use strict";
 
diff --git a/jstests/multiVersion/genericSetFCVUsage/rollback_latest_to_downgraded.js b/jstests/multiVersion/genericSetFCVUsage/rollback_latest_to_downgraded.js
index 7b85f672b1c..d8328df3396 100644
--- a/jstests/multiVersion/genericSetFCVUsage/rollback_latest_to_downgraded.js
+++ b/jstests/multiVersion/genericSetFCVUsage/rollback_latest_to_downgraded.js
@@ -1,8 +1,6 @@
 /**
  * Multiversion rollback test. Checks that rollback succeeds between a
  * 'latest' version rollback node and a downgraded version sync source.
- *
- * @tags: [disabled_due_to_server_58295]
  */
 
 (function() {
diff --git a/jstests/multiVersion/genericSetFCVUsage/run_feature_flag_multiversion_test.js b/jstests/multiVersion/genericSetFCVUsage/run_feature_flag_multiversion_test.js
index f6ed5d9b9b1..af1552dbbf9 100644
--- a/jstests/multiVersion/genericSetFCVUsage/run_feature_flag_multiversion_test.js
+++ b/jstests/multiVersion/genericSetFCVUsage/run_feature_flag_multiversion_test.js
@@ -4,7 +4,7 @@
  * the featureFlagFryer parameter to be disabled.
  *
  * Add test tags for the feature flags depended on by this test.
- * @tags: [featureFlagToaster, featureFlagSpoon, disabled_due_to_server_58295]
+ * @tags: [featureFlagToaster, featureFlagSpoon]
  */
 
 (function() {
@@ -26,7 +26,8 @@ function runTest(downgradeFCV) {
     checkFCV(adminDB, downgradeFCV);
     if (downgradeFCV === lastLTSFCV) {
         numLastLTSRuns++;
-    } else {
+    }
+    if (downgradeFCV === lastContinuousFCV) {
         numLastContRuns++;
     }
     rst.stopSet();
@@ -47,15 +48,29 @@ runFeatureFlagMultiversionTest("featureFlagFryer", runTest);
 assert.eq(numLastLTSRuns, 0);
 assert.eq(numLastContRuns, 0);
 
+// The counters for both lastLTS and lastContinuous runs will be incremented when the two FCVs are
+// equal.
+jsTestLog(`The lastLTSFCV and lastContinousFCV are equal: ${lastLTSFCV === lastContinuousFCV}`);
+
 // Pass in a feature flag that is slated for release in the latest version. This should run against
 // both the last-lts and last-continuous FCV.
 runFeatureFlagMultiversionTest("featureFlagToaster", runTest);
-assert.eq(numLastLTSRuns, 1);
-assert.eq(numLastContRuns, 1);
+if (lastLTSFCV === lastContinuousFCV) {
+    assert.eq(numLastLTSRuns, 2);
+    assert.eq(numLastContRuns, 2);
+} else {
+    assert.eq(numLastLTSRuns, 1);
+    assert.eq(numLastContRuns, 1);
+}
 
 // Pass in a feature flag that was released in an older version. This should only run against the
 // last-lts FCV.
 runFeatureFlagMultiversionTest("featureFlagSpoon", runTest);
-assert.eq(numLastLTSRuns, 2);
-assert.eq(numLastContRuns, 1);
+if (lastLTSFCV === lastContinuousFCV) {
+    assert.eq(numLastLTSRuns, 3);
+    assert.eq(numLastContRuns, 3);
+} else {
+    assert.eq(numLastLTSRuns, 2);
+    assert.eq(numLastContRuns, 1);
+}
 })();
\ No newline at end of file
diff --git a/jstests/multiVersion/genericSetFCVUsage/set_feature_compatibility_version.js b/jstests/multiVersion/genericSetFCVUsage/set_feature_compatibility_version.js
index 308234c9500..3b52a77005f 100644
--- a/jstests/multiVersion/genericSetFCVUsage/set_feature_compatibility_version.js
+++ b/jstests/multiVersion/genericSetFCVUsage/set_feature_compatibility_version.js
@@ -1,7 +1,5 @@
 /**
  * Tests setFeatureCompatibilityVersion.
- *
- * @tags: [disabled_due_to_server_58295]
  */
 
 // Checking UUID consistency involves talking to a shard node, which in this test is shutdown
diff --git a/jstests/multiVersion/verify_versions_test.js b/jstests/multiVersion/verify_versions_test.js
index dcdef6e1d32..26a0463a364 100644
--- a/jstests/multiVersion/verify_versions_test.js
+++ b/jstests/multiVersion/verify_versions_test.js
@@ -4,8 +4,6 @@
  * In particular, it tests that the shell version (returned by version()) compares equal to
  * "latest", not equal to "last-lts", and x.y compares equal to x.y.z, but that x.w does
  * not.
- *
- * @tags: [disabled_due_to_server_58295]
  */
 
 // Checking UUID consistency involves talking to a shard node, which in this test is shutdown
diff --git a/jstests/replsets/cluster_chaining_override.js b/jstests/replsets/cluster_chaining_override.js
index 84e93109d16..7095d5329b0 100644
--- a/jstests/replsets/cluster_chaining_override.js
+++ b/jstests/replsets/cluster_chaining_override.js
@@ -1,8 +1,6 @@
 /**
  * Tests that if chaining is disabled, enabling the server parameter
  * 'enableOverrideClusterChainingSetting' will allow the node to chain anyway.
- *
- * @tags: [disabled_due_to_server_58295]
  */
 
 (function() {
diff --git a/jstests/replsets/initial_sync_replSetGetStatus.js b/jstests/replsets/initial_sync_replSetGetStatus.js
index feab4800489..d2a7975b0cb 100644
--- a/jstests/replsets/initial_sync_replSetGetStatus.js
+++ b/jstests/replsets/initial_sync_replSetGetStatus.js
@@ -1,8 +1,6 @@
 /**
  * This test tests that replSetGetStatus returns initial sync stats while initial sync is in
  * progress.
- *
- * @tags: [disabled_due_to_server_58295]
  */
 
 (function() {
diff --git a/jstests/replsets/node_restarts_no_oplog_entry_at_stable.js b/jstests/replsets/node_restarts_no_oplog_entry_at_stable.js
index 651dfe63f2e..0c764361e3c 100644
--- a/jstests/replsets/node_restarts_no_oplog_entry_at_stable.js
+++ b/jstests/replsets/node_restarts_no_oplog_entry_at_stable.js
@@ -2,9 +2,13 @@
  * Test that we can restart a node that has an oplog hole open at the stable optime
  * when we kill it.
  *
+ * This test utilizes a single-node replica set and restarts its lone node during execution. Because
+ * single-node replica sets are initiated with the latest FCV, when this test restarts the
+ * node it is possible on multiversion suites for an older binary to be used that is incompatible
+ * with the latest FCV document. Therefore, this test is multiversion incompatible.
  * @tags: [
  *   requires_persistence,
- *   disabled_due_to_server_58295
+ *   multiversion_incompatible
  * ]
  */
 (function() {
diff --git a/jstests/replsets/oplog_sampling.js b/jstests/replsets/oplog_sampling.js
index e68d976f06b..ff477521dbe 100644
--- a/jstests/replsets/oplog_sampling.js
+++ b/jstests/replsets/oplog_sampling.js
@@ -1,7 +1,7 @@
 /**
  * Ensure serverStatus reports the total time spent sampling the oplog for all storage engines that
  * support OplogStones.
- * @tags: [ requires_wiredtiger, requires_persistence, disabled_due_to_server_58295 ]
+ * @tags: [ requires_wiredtiger, requires_persistence ]
  */
 (function() {
 "use strict";
diff --git a/jstests/replsets/rollback_with_coalesced_txn_table_updates_during_oplog_application.js b/jstests/replsets/rollback_with_coalesced_txn_table_updates_during_oplog_application.js
index c480313fa9a..22adec4a939 100644
--- a/jstests/replsets/rollback_with_coalesced_txn_table_updates_during_oplog_application.js
+++ b/jstests/replsets/rollback_with_coalesced_txn_table_updates_during_oplog_application.js
@@ -6,7 +6,7 @@
  * We also test that if a node crashes after oplog truncation during rollback, the update made to
  * the 'config.transactions' table is persisted on startup.
  *
- * @tags: [requires_persistence, disabled_due_to_server_58295]
+ * @tags: [requires_persistence]
  */
 
 (function() {
diff --git a/jstests/replsets/rollback_with_coalesced_txn_table_updates_from_vectored_inserts.js b/jstests/replsets/rollback_with_coalesced_txn_table_updates_from_vectored_inserts.js
index 025b318ac9e..b56a40c51ab 100644
--- a/jstests/replsets/rollback_with_coalesced_txn_table_updates_from_vectored_inserts.js
+++ b/jstests/replsets/rollback_with_coalesced_txn_table_updates_from_vectored_inserts.js
@@ -4,7 +4,7 @@
  * to the 'config.transactions' table were coalesced into a single operation when performing
  * vectored inserts on the primary.
  *
- * @tags: [requires_persistence, disabled_due_to_server_58295]
+ * @tags: [requires_persistence]
  */
 
 (function() {
diff --git a/jstests/replsets/stepdown_kill_other_ops.js b/jstests/replsets/stepdown_kill_other_ops.js
index 0ccd97bce6a..9d007a2593d 100644
--- a/jstests/replsets/stepdown_kill_other_ops.js
+++ b/jstests/replsets/stepdown_kill_other_ops.js
@@ -1,5 +1,4 @@
 // SERVER-15310 Ensure that stepDown kills all other running operations
-// @tags: [disabled_due_to_server_58295]
 
 (function() {
 "use strict";
diff --git a/jstests/replsets/tenant_migration_donor_kill_op_retry.js b/jstests/replsets/tenant_migration_donor_kill_op_retry.js
index bbcbfe8b049..41617b027a6 100644
--- a/jstests/replsets/tenant_migration_donor_kill_op_retry.js
+++ b/jstests/replsets/tenant_migration_donor_kill_op_retry.js
@@ -2,7 +2,6 @@
  * Tests that the donor will retry its steps if its OperationContext is interrupted by a killOp.
  *
  * @tags: [
- *   disabled_due_to_server_58295,
  *   incompatible_with_eft,
  *   incompatible_with_macos,
  *   incompatible_with_windows_tls,
diff --git a/jstests/replsets/v2_delta_oplog_entries.js b/jstests/replsets/v2_delta_oplog_entries.js
index 1dab4310780..12957573fff 100644
--- a/jstests/replsets/v2_delta_oplog_entries.js
+++ b/jstests/replsets/v2_delta_oplog_entries.js
@@ -6,8 +6,6 @@
  * This test relies on the DBHash checker to run at the end to ensure that the primaries and
  * secondaries have the same data. For that reason it's important that this test not drop
  * intermediate collections.
- *
- * @tags: [disabled_due_to_server_58295]
  */
 (function() {
 const rst = new ReplSetTest({name: "v2_delta_oplog_entries", nodes: 2});