diff options
5 files changed, 18 insertions, 46 deletions
diff --git a/jstests/sharding/database_versioning_all_commands.js b/jstests/sharding/database_versioning_all_commands.js index 3f385c8c5b3..e03c48b9661 100644 --- a/jstests/sharding/database_versioning_all_commands.js +++ b/jstests/sharding/database_versioning_all_commands.js @@ -1,7 +1,6 @@ /** * Specifies for each command whether it is expected to send a databaseVersion, and verifies that * the commands match the specification. - * @tags: [requires_fcv_44] */ (function() { 'use strict'; @@ -664,8 +663,8 @@ let testCases = { whatsmyuri: {skip: "executes locally on mongos (not sent to any remote node)"}, }; -commandsRemovedFromMongosIn44.forEach(function(cmd) { - testCases[cmd] = {skip: "must define test coverage for 4.2 backwards compatibility"}; +commandsRemovedFromMongosIn46.forEach(function(cmd) { + testCases[cmd] = {skip: "must define test coverage for 4.6 backwards compatibility"}; }); const st = new ShardingTest({shards: 2, mongos: 2}); @@ -688,14 +687,14 @@ assert.commandWorked(listCommandsRes); // After iterating through all the existing commands, ensure there were no additional test cases // that did not correspond to any mongos command. for (let key of Object.keys(testCases)) { - // We have defined real test cases for commands added in 4.4 so that the test cases are + // We have defined real test cases for commands added in 4.6 so that the test cases are // exercised in the regular suites, but because these test cases can't run in the last // stable suite, we skip processing them here to avoid failing the below assertion. - // We have defined "skip" test cases for commands removed in 4.4 so the test case is defined + // We have defined "skip" test cases for commands removed in 4.6 so the test case is defined // in last stable suites (in which these commands still exist on the mongos), but these test // cases won't be run in regular suites, so we skip processing them below as well. - if (commandsAddedToMongosIn44.includes(key) || - commandsRemovedFromMongosIn44.includes(key)) { + if (commandsAddedToMongosIn46.includes(key) || + commandsRemovedFromMongosIn46.includes(key)) { continue; } assert(testCases[key].validated || testCases[key].conditional, diff --git a/jstests/sharding/libs/last_stable_mongos_commands.js b/jstests/sharding/libs/last_stable_mongos_commands.js index cd23b2904c2..d66e626b138 100644 --- a/jstests/sharding/libs/last_stable_mongos_commands.js +++ b/jstests/sharding/libs/last_stable_mongos_commands.js @@ -1,10 +1,10 @@ -// These commands were removed from mongos 4.4, but will still appear in the listCommands output -// of a 4.2 mongos. A last-stable mongos will be unable to run a command on a latest version shard +// These commands were removed from mongos 4.6, but will still appear in the listCommands output +// of a 4.4 mongos. A last-stable mongos will be unable to run a command on a latest version shard // that no longer supports that command. To increase test coverage and allow us to run on same- and // mixed-version suites, we allow these commands to have a test defined without always existing on // the servers being used. -const commandsRemovedFromMongosIn44 = []; -// These commands were added in mongos 4.4, so will not appear in the listCommands output of a -// 4.2 mongos. We will allow these commands to have a test defined without always existing on the +const commandsRemovedFromMongosIn46 = []; +// These commands were added in mongos 4.6, so will not appear in the listCommands output of a +// 4.4 mongos. We will allow these commands to have a test defined without always existing on the // mongos being used. -const commandsAddedToMongosIn44 = ['refineCollectionShardKey']; +const commandsAddedToMongosIn46 = []; diff --git a/jstests/sharding/safe_secondary_reads_drop_recreate.js b/jstests/sharding/safe_secondary_reads_drop_recreate.js index 85f3bc6e19b..b3c4a1bb9af 100644 --- a/jstests/sharding/safe_secondary_reads_drop_recreate.js +++ b/jstests/sharding/safe_secondary_reads_drop_recreate.js @@ -15,15 +15,6 @@ * *when the the collection has been dropped and recreated as empty.* * - behavior: Must be "unshardedOnly", or "versioned". Determines what system profiler checks are * performed. - * - * Tagged as 'requires_fcv_44', since this test cannot run against versions less then 4.4. This is - * because 'planCacheListPlans' and 'planCacheListQueryShapes' were deleted in 4.4, and thus not - * tested here. But this test asserts that all commands are covered, so will fail against a version - * of the server which implements these commands. - * - * @tags: [ - * requires_fcv_44, - * ] */ (function() { "use strict"; @@ -315,8 +306,8 @@ let testCases = { whatsmyuri: {skip: "does not return user data"} }; -commandsRemovedFromMongosIn44.forEach(function(cmd) { - testCases[cmd] = {skip: "must define test coverage for 4.2 backwards compatibility"}; +commandsRemovedFromMongosIn46.forEach(function(cmd) { + testCases[cmd] = {skip: "must define test coverage for 4.4 backwards compatibility"}; }); let scenarios = { diff --git a/jstests/sharding/safe_secondary_reads_single_migration_suspend_range_deletion.js b/jstests/sharding/safe_secondary_reads_single_migration_suspend_range_deletion.js index 8c5f7ea8d87..387ba1d08c8 100644 --- a/jstests/sharding/safe_secondary_reads_single_migration_suspend_range_deletion.js +++ b/jstests/sharding/safe_secondary_reads_single_migration_suspend_range_deletion.js @@ -22,15 +22,6 @@ * results for the command run with read concern 'available'. * - behavior: Must be one of "unshardedOnly", "targetsPrimaryUsesConnectionVersioning" or * "versioned". Determines what system profiler checks are performed. - * - * Tagged as 'requires_fcv_44', since this test cannot run against versions less then 4.4. This is - * because 'planCacheListPlans' and 'planCacheListQueryShapes' were deleted in 4.4, and thus not - * tested here. But this test asserts that all commands are covered, so will fail against a version - * of the server which implements these commands. - * - * @tags: [ - * requires_fcv_44, - * ] */ (function() { "use strict"; @@ -387,8 +378,8 @@ let testCases = { whatsmyuri: {skip: "does not return user data"} }; -commandsRemovedFromMongosIn44.forEach(function(cmd) { - testCases[cmd] = {skip: "must define test coverage for 4.2 backwards compatibility"}; +commandsRemovedFromMongosIn46.forEach(function(cmd) { + testCases[cmd] = {skip: "must define test coverage for 4.4 backwards compatibility"}; }); // Set the secondaries to priority 0 and votes 0 to prevent the primaries from stepping down. diff --git a/jstests/sharding/safe_secondary_reads_single_migration_waitForDelete.js b/jstests/sharding/safe_secondary_reads_single_migration_waitForDelete.js index c7cd0d7ca89..f0af23b6787 100644 --- a/jstests/sharding/safe_secondary_reads_single_migration_waitForDelete.js +++ b/jstests/sharding/safe_secondary_reads_single_migration_waitForDelete.js @@ -15,15 +15,6 @@ * *when the range has been deleted on the donor.* * - behavior: Must be one of "unshardedOnly", "targetsPrimaryUsesConnectionVersioning" or * "versioned". Determines what system profiler checks are performed. - * - * Tagged as 'requires_fcv_44', since this test cannot run against versions less then 4.4. This is - * because 'planCacheListPlans' and 'planCacheListQueryShapes' were deleted in 4.4, and thus not - * tested here. But this test asserts that all commands are covered, so will fail against a version - * of the server which implements these commands. - * - * @tags: [ - * requires_fcv_44, - * ] */ (function() { "use strict"; @@ -322,8 +313,8 @@ let testCases = { whatsmyuri: {skip: "does not return user data"} }; -commandsRemovedFromMongosIn44.forEach(function(cmd) { - testCases[cmd] = {skip: "must define test coverage for 4.2 backwards compatibility"}; +commandsRemovedFromMongosIn46.forEach(function(cmd) { + testCases[cmd] = {skip: "must define test coverage for 4.4 backwards compatibility"}; }); // Set the secondaries to priority 0 and votes 0 to prevent the primaries from stepping down. |