summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDianna Hohensee <dianna.hohensee@10gen.com>2016-01-08 14:57:55 -0500
committerDianna Hohensee <dianna.hohensee@10gen.com>2016-01-11 17:35:45 -0500
commit5be3e6bcfe523ffdce23099c71ffc23fa40c2560 (patch)
tree76b905f3cbcef2fccc77f2fca26ac3beeeb3bde7
parent1c28e37982441275cc127853985b30f2c6e74ff5 (diff)
downloadmongo-5be3e6bcfe523ffdce23099c71ffc23fa40c2560.tar.gz
SERVER-22081 Enable CSRS continuous stepdown workload in evergreen
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml6
-rw-r--r--etc/evergreen.yml1
-rw-r--r--jstests/libs/override_methods/sharding_continuous_config_stepdown.js11
3 files changed, 16 insertions, 2 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
index 0371703ac10..0abe7d01cb2 100644
--- a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
@@ -63,6 +63,7 @@ selector:
- jstests/sharding/tag_range.js
- jstests/sharding/top_chunk_autosplit.js
- jstests/sharding/count_config_servers.js
+ - jstests/sharding/conf_server_write_concern.js
# Calls the config server primary directly (not through mongos)
- jstests/sharding/moveprimary_ignore_sharded.js
- jstests/sharding/min_optime_recovery.js
@@ -78,8 +79,9 @@ selector:
- jstests/sharding/startup_with_all_configs_down.js
# Test runs really slow with the primary continuously stepping down
- jstests/sharding/zbigMapReduce.js
- # Unknown balancer errors - need to be investigated
- - jstests/sharding/in_memory_sort_limit.js
+ # Continuous config server step down only available with CSRS
+ - jstests/sharding/csrs_upgrade_during_migrate.js
+ - jstests/sharding/csrs_upgrade.js
executor:
js_test:
config:
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index dfd4be2471e..3e30f68899d 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -3902,6 +3902,7 @@ buildvariants:
- name: sharding_legacy_op_query_WT
- name: sharding_op_query_WT
- name: sharding_legacy_multiversion
+ - name: sharding_csrs_continuous_config_stepdown_WT
- name: slow1
- name: slow1_WT
- name: slow2
diff --git a/jstests/libs/override_methods/sharding_continuous_config_stepdown.js b/jstests/libs/override_methods/sharding_continuous_config_stepdown.js
index e272ebf84bc..017488f06ff 100644
--- a/jstests/libs/override_methods/sharding_continuous_config_stepdown.js
+++ b/jstests/libs/override_methods/sharding_continuous_config_stepdown.js
@@ -5,6 +5,7 @@
// Contains the declaration for ScopedThread and CountDownLatch
load('jstests/libs/parallelTester.js');
+load("jstests/replsets/rslib.js");
(function() {
'use strict';
@@ -111,6 +112,16 @@ ReplSetTest = function ReplSetTestWithContinuousPrimaryStepdown() {
throw new Error('Continuous failover thread is already active');
}
+ // Reduce electionTimeoutMillis to 5 seconds, from 10, so that chunk migrations don't
+ // time out because of the CSRS primary being down so often for so long.
+ print('Reducing electionTimeoutMillis to 5 seconds');
+ var rsconfig = this.getConfigFromPrimary();
+ rsconfig.version++;
+ rsconfig.settings.electionTimeoutMillis = 5000;
+ reconfig(this, rsconfig);
+ assert.eq(this.getConfigFromPrimary().settings.electionTimeoutMillis, 5000,
+ "Failed to lower the electionTimeoutMillis to 5000 milliseconds");
+
_scopedPrimaryStepdownThreadStopCounter = new CountDownLatch(1);
_scopedPrimaryStepdownThread = new ScopedThread(_continuousPrimaryStepdownFn,
this.nodes[0].host,