diff options
6 files changed, 94 insertions, 63 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding_rs_matching_disabled.yml b/buildscripts/resmokeconfig/suites/sharding_rs_matching_disabled.yml deleted file mode 100644 index 426e198d459..00000000000 --- a/buildscripts/resmokeconfig/suites/sharding_rs_matching_disabled.yml +++ /dev/null @@ -1,22 +0,0 @@ -test_kind: js_test - -selector: - roots: - - jstests/sharding/*.js - - jstests/sharding/change_streams/*.js - - jstests/sharding/query/*.js - exclude_files: - # Skip tests that set the matching policy internally. - - jstests/sharding/sharding_task_executor_pool_matching_policy.js - -executor: - config: - shell_options: - nodb: '' - readMode: commands - global_vars: - TestData: - setParameters: - ShardingTaskExecutorPoolReplicaSetMatching: "disabled" - setParametersMongos: - ShardingTaskExecutorPoolReplicaSetMatching: "disabled" diff --git a/buildscripts/resmokeconfig/suites/sharding_rs_matching_match_busiest_node.yml b/buildscripts/resmokeconfig/suites/sharding_rs_matching_match_busiest_node.yml deleted file mode 100644 index 9b6827c231c..00000000000 --- a/buildscripts/resmokeconfig/suites/sharding_rs_matching_match_busiest_node.yml +++ /dev/null @@ -1,22 +0,0 @@ -test_kind: js_test - -selector: - roots: - - jstests/sharding/*.js - - jstests/sharding/change_streams/*.js - - jstests/sharding/query/*.js - exclude_files: - # Skip tests that set the matching policy internally. - - jstests/sharding/sharding_task_executor_pool_matching_policy.js - -executor: - config: - shell_options: - nodb: '' - readMode: commands - global_vars: - TestData: - setParameters: - ShardingTaskExecutorPoolReplicaSetMatching: "matchBusiestNode" - setParametersMongos: - ShardingTaskExecutorPoolReplicaSetMatching: "matchBusiestNode" diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 903b12ffe8c..51b229c62e2 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -6794,24 +6794,6 @@ tasks: use_multiversion: /data/multiversion suite: sharding_multiversion -- name: sharding_rs_matching_disabled_gen - tags: ["sharding", "common"] - commands: - - func: "generate resmoke tasks" - vars: - use_large_distro: "true" - resmoke_args: --storageEngine=wiredTiger - fallback_num_sub_suites: 32 - -- name: sharding_rs_matching_match_busiest_node_gen - tags: ["sharding", "common"] - commands: - - func: "generate resmoke tasks" - vars: - use_large_distro: "true" - resmoke_args: --storageEngine=wiredTiger - fallback_num_sub_suites: 32 - - name: sharding_max_mirroring_gen tags: ["sharding", "common"] commands: @@ -12794,6 +12776,96 @@ buildvariants: - name: .sharding .jscore !.wo_snapshot !.multi_stmt - name: .sharding .common !.csrs +- name: enterprise-ubuntu-sharding-task-executor-pool-rsm-matchPrimary-1604-64-bit + display_name: "~ Enterprise Ubuntu 16.04 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchPrimaryNode\"})" + batchtime: 1440 # 1 day + run_on: + - ubuntu1604-test + modules: + - enterprise + expansions: + scons_cache_scope: shared + compile_flags: MONGO_DISTMOD=ubuntu1604 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars + multiversion_platform: ubuntu1604 + multiversion_edition: enterprise + test_flags: >- + --mongosSetParameters="ShardingTaskExecutorPoolReplicaSetMatching: \"matchPrimaryNode\"" + --excludeWithAnyTags=sets_replica_set_matching_strategy + large_distro_name: ubuntu1604-build + tasks: + - name: compile_test_and_package_serial_TG + distros: + - ubuntu1604-build + - name: .aggregation !.no_async + - name: .sharding .auth + - name: .sharding .causally_consistent !.wo_snapshot + - name: .concurrency .common !.kill_terminate + - name: .integration !.audit + - name: .jscore .common + - name: .logical_session_cache .one_sec + - name: .sharding .jscore !.wo_snapshot !.multi_stmt + - name: .sharding .common !.csrs + +- name: enterprise-ubuntu-sharding-task-executor-pool-rsm-matchBusiest-1604-64-bit + display_name: "~ Enterprise Ubuntu 16.04 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchBusiestNode\"})" + batchtime: 1440 # 1 day + run_on: + - ubuntu1604-test + modules: + - enterprise + expansions: + scons_cache_scope: shared + compile_flags: MONGO_DISTMOD=ubuntu1604 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars + multiversion_platform: ubuntu1604 + multiversion_edition: enterprise + test_flags: >- + --mongosSetParameters="ShardingTaskExecutorPoolReplicaSetMatching: \"matchBusiestNode\"" + --excludeWithAnyTags=sets_replica_set_matching_strategy + large_distro_name: ubuntu1604-build + tasks: + - name: compile_test_and_package_serial_TG + distros: + - ubuntu1604-build + - name: .aggregation !.no_async + - name: .sharding .auth + - name: .sharding .causally_consistent !.wo_snapshot + - name: .concurrency .common !.kill_terminate + - name: .integration !.audit + - name: .jscore .common + - name: .logical_session_cache .one_sec + - name: .sharding .jscore !.wo_snapshot !.multi_stmt + - name: .sharding .common !.csrs + +- name: enterprise-ubuntu-sharding-task-executor-pool-rsm-disabled-1604-64-bit + display_name: "~ Enterprise Ubuntu 16.04 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"disabled\"})" + batchtime: 1440 # 1 day + run_on: + - ubuntu1604-test + modules: + - enterprise + expansions: + scons_cache_scope: shared + compile_flags: MONGO_DISTMOD=ubuntu1604 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars + multiversion_platform: ubuntu1604 + multiversion_edition: enterprise + test_flags: >- + --mongosSetParameters="ShardingTaskExecutorPoolReplicaSetMatching: \"disabled\"" + --excludeWithAnyTags=sets_replica_set_matching_strategy + large_distro_name: ubuntu1604-build + tasks: + - name: compile_test_and_package_serial_TG + distros: + - ubuntu1604-build + - name: .aggregation !.no_async + - name: .sharding .auth + - name: .sharding .causally_consistent !.wo_snapshot + - name: .concurrency .common !.kill_terminate + - name: .integration !.audit + - name: .jscore .common + - name: .logical_session_cache .one_sec + - name: .sharding .jscore !.wo_snapshot !.multi_stmt + - name: .sharding .common !.csrs + - name: shared-scons-cache-pruning display_name: "Shared SCons Cache Pruning" run_on: diff --git a/jstests/noPassthrough/predictive_connpool.js b/jstests/noPassthrough/predictive_connpool.js index 81e56e84881..05c82d2facd 100644 --- a/jstests/noPassthrough/predictive_connpool.js +++ b/jstests/noPassthrough/predictive_connpool.js @@ -4,6 +4,7 @@ load("jstests/libs/parallelTester.js"); * @tags: [ * requires_sharding, * sbe_incompatible, + * sets_replica_set_matching_strategy, * ] */ diff --git a/jstests/noPassthrough/set_step_params.js b/jstests/noPassthrough/set_step_params.js index 9ac8b58154a..cc6ec9a629b 100644 --- a/jstests/noPassthrough/set_step_params.js +++ b/jstests/noPassthrough/set_step_params.js @@ -1,7 +1,7 @@ load("jstests/libs/parallelTester.js"); /** - * @tags: [requires_replication, requires_sharding] + * @tags: [requires_replication, requires_sharding, sets_replica_set_matching_strategy] */ (function() { diff --git a/jstests/sharding/sharding_task_executor_pool_matching_policy.js b/jstests/sharding/sharding_task_executor_pool_matching_policy.js index bb7341825af..a293c8c779d 100644 --- a/jstests/sharding/sharding_task_executor_pool_matching_policy.js +++ b/jstests/sharding/sharding_task_executor_pool_matching_policy.js @@ -1,6 +1,8 @@ // Tests that the ShardingTaskExecutorPoolReplicaSetMatchingPolicy is correctly set when the default // "automatic" value is used for the ShardingTaskExecutorPoolReplicaSetMatching parameter (on // mongos, "matchPrimaryNode" should be set; on mongod, the policy should be "disabled"). +// +// @tags: [sets_replica_set_matching_strategy] (function() { "use strict"; |