diff options
17 files changed, 13 insertions, 13 deletions
diff --git a/buildscripts/resmokeconfig/suites/change_streams_mongos_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_mongos_passthrough.yml index f0789549871..f3e3a089fbc 100644 --- a/buildscripts/resmokeconfig/suites/change_streams_mongos_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/change_streams_mongos_passthrough.yml @@ -53,4 +53,3 @@ executor: enableTestCommands: 1 periodicNoopIntervalSecs: 1 writePeriodicNoops: true - num_rs_nodes_per_shard: 1 diff --git a/buildscripts/resmokeconfig/suites/change_streams_mongos_sessions_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_mongos_sessions_passthrough.yml index 0bfbf638e3a..dbf3a7a093f 100644 --- a/buildscripts/resmokeconfig/suites/change_streams_mongos_sessions_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/change_streams_mongos_sessions_passthrough.yml @@ -54,7 +54,6 @@ executor: enableTestCommands: 1 periodicNoopIntervalSecs: 1 writePeriodicNoops: true - num_rs_nodes_per_shard: 1 # This test suite doesn't actually shard any collections, but enabling sharding will prevent # read commands against non-existent databases from unconditionally returning a CursorId of 0. enable_sharding: diff --git a/buildscripts/resmokeconfig/suites/change_streams_multi_stmt_txn_mongos_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_multi_stmt_txn_mongos_passthrough.yml index ff7c8170176..88ce52e3d1b 100644 --- a/buildscripts/resmokeconfig/suites/change_streams_multi_stmt_txn_mongos_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/change_streams_multi_stmt_txn_mongos_passthrough.yml @@ -59,7 +59,6 @@ executor: enableTestCommands: 1 periodicNoopIntervalSecs: 1 writePeriodicNoops: true - num_rs_nodes_per_shard: 1 # This test suite doesn't actually shard any collections, but enabling sharding will prevent # read commands against non-existent databases from unconditionally returning a CursorId of 0. enable_sharding: diff --git a/buildscripts/resmokeconfig/suites/change_streams_multi_stmt_txn_sharded_collections_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_multi_stmt_txn_sharded_collections_passthrough.yml index db182de7dac..2b5f6f4e5a8 100644 --- a/buildscripts/resmokeconfig/suites/change_streams_multi_stmt_txn_sharded_collections_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/change_streams_multi_stmt_txn_sharded_collections_passthrough.yml @@ -56,7 +56,6 @@ executor: enableTestCommands: 1 writePeriodicNoops: 1 periodicNoopIntervalSecs: 1 - num_rs_nodes_per_shard: 1 num_shards: 2 enable_sharding: - test diff --git a/buildscripts/resmokeconfig/suites/change_streams_sharded_collections_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_sharded_collections_passthrough.yml index ea2a6b25fdb..21c26f0b972 100644 --- a/buildscripts/resmokeconfig/suites/change_streams_sharded_collections_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/change_streams_sharded_collections_passthrough.yml @@ -51,7 +51,6 @@ executor: enableTestCommands: 1 writePeriodicNoops: 1 periodicNoopIntervalSecs: 1 - num_rs_nodes_per_shard: 1 num_shards: 2 enable_sharding: - test diff --git a/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_mongos_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_mongos_passthrough.yml index fed3fe38c2a..3f702c1bb5c 100644 --- a/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_mongos_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_mongos_passthrough.yml @@ -56,4 +56,3 @@ executor: enableTestCommands: 1 periodicNoopIntervalSecs: 1 writePeriodicNoops: true - num_rs_nodes_per_shard: 1 diff --git a/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_sharded_collections_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_sharded_collections_passthrough.yml index 3a2f563930b..838a57c1e3e 100644 --- a/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_sharded_collections_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/change_streams_whole_cluster_sharded_collections_passthrough.yml @@ -54,7 +54,6 @@ executor: enableTestCommands: 1 writePeriodicNoops: 1 periodicNoopIntervalSecs: 1 - num_rs_nodes_per_shard: 1 num_shards: 2 enable_sharding: - test diff --git a/buildscripts/resmokeconfig/suites/change_streams_whole_db_mongos_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_whole_db_mongos_passthrough.yml index f1a5767bf44..0642f8af5fc 100644 --- a/buildscripts/resmokeconfig/suites/change_streams_whole_db_mongos_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/change_streams_whole_db_mongos_passthrough.yml @@ -61,4 +61,3 @@ executor: enableTestCommands: 1 periodicNoopIntervalSecs: 1 writePeriodicNoops: true - num_rs_nodes_per_shard: 1 diff --git a/buildscripts/resmokeconfig/suites/change_streams_whole_db_sharded_collections_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_whole_db_sharded_collections_passthrough.yml index 09c34567ae3..2b3b5ed4064 100644 --- a/buildscripts/resmokeconfig/suites/change_streams_whole_db_sharded_collections_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/change_streams_whole_db_sharded_collections_passthrough.yml @@ -55,7 +55,6 @@ executor: enableTestCommands: 1 writePeriodicNoops: 1 periodicNoopIntervalSecs: 1 - num_rs_nodes_per_shard: 1 num_shards: 2 enable_sharding: - test diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml index 475eb034700..aa19d09312f 100644 --- a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml +++ b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml @@ -40,4 +40,7 @@ executor: enableTestCommands: 1 writePeriodicNoops: 1 verbose: '' + # TODO: SERVER-43927 Make jstestfuzz_sharded and jstestfuzz_sharded_session suite start + # shards as replica sets. + num_rs_nodes_per_shard: null num_shards: 2 diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_session.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_session.yml index ef26dd64119..90b495b5d17 100644 --- a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_session.yml +++ b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded_session.yml @@ -37,4 +37,7 @@ executor: enableTestCommands: 1 writePeriodicNoops: 1 verbose: '' + # TODO: SERVER-43927 Make jstestfuzz_sharded and jstestfuzz_sharded_session suite start + # shards as replica sets. + num_rs_nodes_per_shard: null num_shards: 2 diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml index 26ea2a0b9cc..5c522ab278a 100644 --- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml @@ -61,4 +61,3 @@ executor: mongod_options: set_parameters: enableTestCommands: 1 - num_rs_nodes_per_shard: 1 diff --git a/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml b/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml index 3602c55a8f8..87ebb6eead4 100644 --- a/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml +++ b/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml @@ -54,4 +54,3 @@ executor: mongod_options: set_parameters: enableTestCommands: 1 - num_rs_nodes_per_shard: 1 diff --git a/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml b/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml index b7ac7337599..48d80173a4a 100644 --- a/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml +++ b/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml @@ -60,5 +60,4 @@ executor: mongod_options: set_parameters: enableTestCommands: 1 - num_rs_nodes_per_shard: 1 num_shards: 2 diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml index 96c143ea3a5..4c70c163e00 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml @@ -85,5 +85,8 @@ executor: mongod_options: set_parameters: enableTestCommands: 1 + # TODO: SERVER-43892 Make sharding_jscore_op_query_passthrough and sharding_jscore_passthrough start + # shards as replica sets by default. + num_rs_nodes_per_shard: null enable_sharding: - test diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml index 89e83291598..1667f75db9b 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml @@ -84,5 +84,8 @@ executor: mongod_options: set_parameters: enableTestCommands: 1 + # TODO: SERVER-43892 Make sharding_jscore_op_query_passthrough and sharding_jscore_passthrough start + # shards as replica sets by default. + num_rs_nodes_per_shard: null enable_sharding: - test diff --git a/buildscripts/resmokelib/testing/fixtures/shardedcluster.py b/buildscripts/resmokelib/testing/fixtures/shardedcluster.py index 29325870284..5b808f9b458 100644 --- a/buildscripts/resmokelib/testing/fixtures/shardedcluster.py +++ b/buildscripts/resmokelib/testing/fixtures/shardedcluster.py @@ -24,7 +24,7 @@ class ShardedClusterFixture(interface.Fixture): # pylint: disable=too-many-inst def __init__( # pylint: disable=too-many-arguments,too-many-locals self, logger, job_num, mongos_executable=None, mongos_options=None, mongod_options=None, - dbpath_prefix=None, preserve_dbpath=False, num_shards=1, num_rs_nodes_per_shard=None, + dbpath_prefix=None, preserve_dbpath=False, num_shards=1, num_rs_nodes_per_shard=1, num_mongos=1, enable_sharding=None, enable_balancer=True, enable_autosplit=True, auth_options=None, configsvr_options=None, shard_options=None, mixed_bin_versions=None): """Initialize ShardedClusterFixture with different options for the cluster processes.""" |