SERVER-58355 Re-enable resharding tests failing in multiversion suites due to changing latest releast to 5.1

2024-12-01 09:32:32 +01:00 · 2021-07-23 17:06:08 +00:00 · 2021-07-23 17:06:08 +00:00 · 2cb6e665fd
commit 2cb6e665fd
parent 1f6644feb4
18 changed files with 30 additions and 30 deletions
--- a/jstests/multiVersion/setfcv_reshard_collection.js
+++ b/jstests/multiVersion/setfcv_reshard_collection.js
@ -1,8 +1,10 @@
 /**
+ * TODO SERVER-55912: Remove this tag to re-enable test
 * @tags: [
 *   disabled_due_to_server_58295
 * ]
 */
+
 (function() {
 "use strict";

--- a/jstests/sharding/libs/resharding_test_fixture.js
+++ b/jstests/sharding/libs/resharding_test_fixture.js
@ -823,4 +823,9 @@ var ReshardingTest = class {

        return cloneTimestamp;
    }
+
+    isMixedVersionCluster() {
+        const clusterVersionInfo = this._st.getClusterVersionInfo();
+        return clusterVersionInfo.isMixedVersion;
+    }
 };
--- a/jstests/sharding/reshard_collection_joins_existing_operation.js
+++ b/jstests/sharding/reshard_collection_joins_existing_operation.js
@ -9,7 +9,6 @@
 *
 * @tags: [
 *   uses_atclustertime,
- *   disabled_due_to_server_58295
 * ]
 */
 (function() {
--- a/jstests/sharding/resharding_abort_command.js
+++ b/jstests/sharding/resharding_abort_command.js
@ -2,7 +2,7 @@
 * Test to make sure that the abort command interrupts a resharding operation that has not yet
 * persisted a decision.
 *
- * @tags: [uses_atclustertime, disabled_due_to_server_58295]
+ * @tags: [uses_atclustertime]
 */
 (function() {
 "use strict";
--- a/jstests/sharding/resharding_abort_in_preparing_to_donate.js
+++ b/jstests/sharding/resharding_abort_in_preparing_to_donate.js
@ -4,8 +4,7 @@
 * machine creation. See SERVER-56936 for more details.
 *
 * @tags: [
- *   uses_atclustertime,
- *   disabled_due_to_server_58295
+ *   uses_atclustertime
 * ]
 */
 (function() {
--- a/jstests/sharding/resharding_change_stream_internal_ops.js
+++ b/jstests/sharding/resharding_change_stream_internal_ops.js
@ -7,7 +7,8 @@
 //   requires_majority_read_concern,
 //   uses_change_streams,
 //   uses_atclustertime,
-//   disabled_due_to_server_58295
+//   requires_fcv_51
+//
 // ]
 (function() {
 "use strict";
--- a/jstests/sharding/resharding_change_streams_resumability.js
+++ b/jstests/sharding/resharding_change_streams_resumability.js
@ -3,8 +3,7 @@
 //
 // @tags: [
 //   requires_majority_read_concern,
-//   uses_atclustertime,
-//   disabled_due_to_server_58295
+//   uses_atclustertime
 // ]
 (function() {
 "use strict";
--- a/jstests/sharding/resharding_clones_duplicate_key.js
+++ b/jstests/sharding/resharding_clones_duplicate_key.js
@ -3,8 +3,7 @@
 * recipient.
 *
 * @tags: [
- *   uses_atclustertime,
- *   disabled_due_to_server_58295
+ *   uses_atclustertime
 * ]
 */
 (function() {
--- a/jstests/sharding/resharding_commit.js
+++ b/jstests/sharding/resharding_commit.js
@ -1,7 +1,7 @@
 /**
 * Test the commitReshardCollection command.
 *
- * @tags: [uses_atclustertime, disabled_due_to_server_58295]
+ * @tags: [uses_atclustertime]
 */
 (function() {
 "use strict";
--- a/jstests/sharding/resharding_critical_section_timeout.js
+++ b/jstests/sharding/resharding_critical_section_timeout.js
@ -2,8 +2,7 @@
 * Verifies that resharding honors the critical section timeout.
 *
 * @tags: [
- *   uses_atclustertime,
- *   disabled_due_to_server_58295
+ *   uses_atclustertime
 * ]
 */

--- a/jstests/sharding/resharding_fails_on_nonempty_stash.js
+++ b/jstests/sharding/resharding_fails_on_nonempty_stash.js
@ -3,8 +3,7 @@
 * recipient.
 *
 * @tags: [
- *   uses_atclustertime,
- *   disabled_due_to_server_58295
+ *   uses_atclustertime
 * ]
 */
 (function() {
--- a/jstests/sharding/resharding_metrics_increment.js
+++ b/jstests/sharding/resharding_metrics_increment.js
@ -3,8 +3,7 @@
 * responds to statistical increments in an expected way.
 *
 * @tags: [
- *   uses_atclustertime,
- *   disabled_due_to_server_58295
+ *   uses_atclustertime
 * ]
 */

@ -126,11 +125,13 @@ const topology = DiscoverTopology.findConnectedNodes(mongos);
        "oplogEntriesApplied": e.applied,
    });

-    verifyDict(sub.opcounters, {
-        "insert": e.opcounters.insert,
-        "update": e.opcounters.update,
-        "delete": e.opcounters.delete,
-    });
+    if (!reshardingTest.isMixedVersionCluster()) {
+        verifyDict(sub.opcounters, {
+            "insert": e.opcounters.insert,
+            "update": e.opcounters.update,
+            "delete": e.opcounters.delete,
+        });
+    }

    // bytesCopied is harder to pin down but it should be >0.
    assert.betweenIn(1, sub['bytesCopied'], 1024, 'bytesCopied');
--- a/jstests/sharding/resharding_min_fetch_ts_with_txn.js
+++ b/jstests/sharding/resharding_min_fetch_ts_with_txn.js
@ -3,7 +3,7 @@
 * begins, it will select a cloneTimestamp that is greater than the operation time of those
 * transactions when they commit.
 *
- * @tags: [uses_atclustertime, disabled_due_to_server_58295]
+ * @tags: [uses_atclustertime]
 */
 (function() {
 "use strict";
--- a/jstests/sharding/resharding_read_from_secondary.js
+++ b/jstests/sharding/resharding_read_from_secondary.js
@ -3,8 +3,7 @@
 * or insert state documents for resharding.
 *
 * @tags: [
- *   uses_atclustertime,
- *   disabled_due_to_server_58295
+ *   uses_atclustertime
 * ]
 */
 (function() {
--- a/jstests/sharding/resharding_retryable_writes.js
+++ b/jstests/sharding/resharding_retryable_writes.js
@ -4,7 +4,7 @@
 * txnCloners were not started until after waiting for reshardingMinimumOperationDurationMillis to
 * elapse.
 *
- * @tags: [uses_atclustertime, disabled_due_to_server_58295]
+ * @tags: [uses_atclustertime]
 */

 (function() {
--- a/jstests/sharding/resharding_txn_cloner.js
+++ b/jstests/sharding/resharding_txn_cloner.js
@ -3,8 +3,7 @@
 * shards.
 *
 * @tags: [
- *   uses_atclustertime,
- *   disabled_due_to_server_58295
+ *   uses_atclustertime
 * ]
 */
 (function() {
--- a/jstests/sharding/resharding_verify_primary_catalog_consistency.js
+++ b/jstests/sharding/resharding_verify_primary_catalog_consistency.js
@ -3,8 +3,7 @@
 * operation has completed.
 *
 * @tags: [
- *   uses_atclustertime,
- *   disabled_due_to_server_58295
+ *   uses_atclustertime
 * ]
 */
 (function() {
--- a/jstests/sharding/test_resharding_test_fixture.js
+++ b/jstests/sharding/test_resharding_test_fixture.js
@ -4,7 +4,7 @@
 * Verifies that the reshardCollection command is run and kept suspended in the "applying" state.
 *
 * @tags: [
- *   uses_atclustertime,
+ *   uses_atclustertime
 * ]
 */
 (function() {