From 7b27276ea71b2831181eaac4350bc9ffee521e11 Mon Sep 17 00:00:00 2001 From: Vesselina Ratcheva Date: Sat, 30 Oct 2021 02:25:15 +0000 Subject: SERVER-60935 Fix disabled repl tests failing due to changing latest release to 5.2 --- etc/backports_required_for_multiversion_tests.yml | 2 -- .../genericSetFCVUsage/1_test_launching_replset.js | 26 ++++++++++++++-------- .../genericSetFCVUsage/2_test_launching_cluster.js | 18 +++++++++------ ...tial_sync_replicate_drop_mid_secondary_batch.js | 4 +++- .../reconfig_fails_no_cwwc_set_sharding.js | 2 +- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/etc/backports_required_for_multiversion_tests.yml b/etc/backports_required_for_multiversion_tests.yml index 3fdbbcf2692..b656ff7ab55 100644 --- a/etc/backports_required_for_multiversion_tests.yml +++ b/etc/backports_required_for_multiversion_tests.yml @@ -328,8 +328,6 @@ last-lts: test_file: jstests/sharding/resharding_size_estimate.js - ticket: SERVER-58898 test_file: jstests/replsets/write_concern_write_to_local.js - - ticket: SERVER-56846 - test_file: jstests/sharding/reconfig_fails_no_cwwc_set_sharding.js - ticket: SERVER-59057 test_file: jstests/replsets/rollback_transaction_table.js - ticket: SERVER-58353 diff --git a/jstests/multiVersion/genericSetFCVUsage/1_test_launching_replset.js b/jstests/multiVersion/genericSetFCVUsage/1_test_launching_replset.js index 5cedd4020a7..2d2fcbe85ae 100644 --- a/jstests/multiVersion/genericSetFCVUsage/1_test_launching_replset.js +++ b/jstests/multiVersion/genericSetFCVUsage/1_test_launching_replset.js @@ -1,11 +1,13 @@ // // Tests launching multi-version ReplSetTest replica sets // -// @tags: [disabled_due_to_server_60490] // load('./jstests/multiVersion/libs/verify_versions.js'); +(function() { +"use strict"; + for (let version of ["last-lts", "last-continuous", "latest"]) { jsTestLog("Testing single version: " + version); @@ -43,27 +45,32 @@ for (let versions of [["last-lts", "latest"], ["last-continuous", "latest"]]) { rst.stopSet(); } +// TODO(SERVER-61100): Re-enable this test. +if (true) { + jsTestLog("Skipping test as it is currently disabled."); + return; +} + for (let versions of [["last-lts", "last-continuous"], ["last-continuous", "last-lts"]]) { jsTestLog("Testing mixed versions: " + tojson(versions)); try { var rst = new ReplSetTest({nodes: 2}); + rst.startSet({binVersion: versions}); + rst.initiate(); } catch (e) { if (e instanceof Error) { - assert.includes( - e.message, - "Can only specify one of 'last-lts' and 'last-continuous' in binVersion, not both."); - continue; - } else { - throw e; + if (e.message.includes( + "Can only specify one of 'last-lts' and 'last-continuous' in binVersion, not both.")) { + continue; + } } + throw e; } assert( MongoRunner.areBinVersionsTheSame("last-continuous", "last-lts"), "Should have thrown error in creating ReplSetTest because can only specify one of 'last-lts' and 'last-continuous' in binVersion, not both."); - rst.startSet({binVersion: versions}); - var nodes = rst.nodes; // Make sure we have hosts of all the different versions @@ -77,6 +84,7 @@ for (let versions of [["last-lts", "last-continuous"], ["last-continuous", "last } jsTestLog("Done!"); +})(); // // End diff --git a/jstests/multiVersion/genericSetFCVUsage/2_test_launching_cluster.js b/jstests/multiVersion/genericSetFCVUsage/2_test_launching_cluster.js index 6cb0265c351..69f228875cc 100644 --- a/jstests/multiVersion/genericSetFCVUsage/2_test_launching_cluster.js +++ b/jstests/multiVersion/genericSetFCVUsage/2_test_launching_cluster.js @@ -1,7 +1,6 @@ // // Tests launching multi-version ShardingTest clusters. // -// @tags: [disabled_due_to_server_60490] // load('./jstests/multiVersion/libs/verify_versions.js'); @@ -9,6 +8,12 @@ load('./jstests/multiVersion/libs/verify_versions.js'); (function() { "use strict"; +// TODO(SERVER-61100): Re-enable this test. +if (true) { + jsTestLog("Skipping test as it is currently disabled."); + return; +} + // Sharded cluster upgrade order: config servers -> shards -> mongos. const mixedVersionsToCheck = [ {config: ["latest"], shard: ["last-lts", "latest"], mongos: ["last-lts"]}, @@ -33,13 +38,12 @@ for (let versions of mixedVersionsToCheck) { }); } catch (e) { if (e instanceof Error) { - assert.includes( - e.message, - "Can only specify one of 'last-lts' and 'last-continuous' in binVersion, not both."); - continue; - } else { - throw e; + if (e.message.includes( + "Can only specify one of 'last-lts' and 'last-continuous' in binVersion, not both.")) { + continue; + } } + throw e; } if ((versions.shard[0] === "last-continuous" && versions.shard[1] === "last-lts") || (versions.shard[1] === "last-continuous" && versions.shard[0] === "last-lts")) { diff --git a/jstests/replsets/initial_sync_replicate_drop_mid_secondary_batch.js b/jstests/replsets/initial_sync_replicate_drop_mid_secondary_batch.js index f1b31658f60..ae26bae823d 100644 --- a/jstests/replsets/initial_sync_replicate_drop_mid_secondary_batch.js +++ b/jstests/replsets/initial_sync_replicate_drop_mid_secondary_batch.js @@ -3,7 +3,9 @@ * cloner observed, specifically when it happens during a not-yet-finalized batch on the sync * source. This tests that this is no longer possible. * - * @tags: [requires_replication, incompatible_with_eft, disabled_due_to_server_60490] + * TODO(SERVER-61100): Remove 'requires_fcv_51' tag below. + * + * @tags: [requires_replication, incompatible_with_eft, requires_fcv_51] */ (function() { diff --git a/jstests/sharding/reconfig_fails_no_cwwc_set_sharding.js b/jstests/sharding/reconfig_fails_no_cwwc_set_sharding.js index 8c762cba730..9753683ebb3 100644 --- a/jstests/sharding/reconfig_fails_no_cwwc_set_sharding.js +++ b/jstests/sharding/reconfig_fails_no_cwwc_set_sharding.js @@ -2,7 +2,7 @@ * Test that a reconfig for a shard that would change the implicit default write concern to w:1 * fails if CWWC is not set. * - * @tags: [requires_majority_read_concern, requires_persistence, disabled_due_to_server_60490] + * @tags: [requires_majority_read_concern, requires_persistence, requires_fcv_51] */ (function() { -- cgit v1.2.1