diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2015-12-23 14:38:38 -0500 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2016-01-13 14:42:42 -0500 |
| commit | d7ef8fa46e263cd9307b332e84f5cc124694b5b3 (patch) | |
| tree | 1d79d170274db83444d3ed1e8767ea6316166f9d | |
| parent | 38196fe4849af1aa9f337058a31aed72c57aa8a8 (diff) | |
| download | mongo-d7ef8fa46e263cd9307b332e84f5cc124694b5b3.tar.gz | |
SERVER-22010 Blacklist min_optime_recovery.js from continuous config stepdown suite
Also increases the sleep time of the stepdown thread to allow for balance
rounds to succeed.
| -rw-r--r-- | buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml | 3 | ||||
| -rw-r--r-- | jstests/libs/override_methods/sharding_continuous_config_stepdown.js | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml index 921e8dc5186..f47d7ec62d1 100644 --- a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml +++ b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml @@ -67,8 +67,9 @@ selector: - jstests/sharding/tag_range.js - jstests/sharding/top_chunk_autosplit.js - jstests/sharding/count_config_servers.js - # Awaits replication directly against the config server primary + # Calls the config server primary directly (not through mongos) - jstests/sharding/moveprimary_ignore_sharded.js + - jstests/sharding/min_optime_recovery.js # Runs setShardVersion/getShardVersion against the config server and we don't support retries # for this command - jstests/sharding/major_version_check.js diff --git a/jstests/libs/override_methods/sharding_continuous_config_stepdown.js b/jstests/libs/override_methods/sharding_continuous_config_stepdown.js index 6edf2cbc79a..e272ebf84bc 100644 --- a/jstests/libs/override_methods/sharding_continuous_config_stepdown.js +++ b/jstests/libs/override_methods/sharding_continuous_config_stepdown.js @@ -59,8 +59,11 @@ ReplSetTest = function ReplSetTestWithContinuousPrimaryStepdown() { // Wait for primary to get elected and allow the test to make some progress before
// attempting another stepdown.
- primary = replSet.getPrimary();
- sleep(7000);
+ if (stopCounter.getCount() > 0)
+ primary = replSet.getPrimary();
+
+ if (stopCounter.getCount() > 0)
+ sleep(8000);
}
print('*** Continuous stepdown thread completed successfully');
|