diff options
author | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2016-01-26 17:27:33 -0500 |
---|---|---|
committer | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2016-01-26 17:27:33 -0500 |
commit | 50d09c53bed8185dbe268d1e6d6fa1e68e9161c5 (patch) | |
tree | 0fd18acffffbf6413b552d58bb6b4d1512977a48 | |
parent | c36c82ed483ffcd1087260e4a125c625a2026ed1 (diff) | |
download | mongo-50d09c53bed8185dbe268d1e6d6fa1e68e9161c5.tar.gz |
SERVER-21499 Enable fsm_all_simultaneous.js FSM runner.
fsm_all_simultaneous.js runs different FSM workloads simultaneously. By
default, these workloads still run with their own collection and
database.
Defined concurrency_simultaneous and concurrency_simultaneous_WT tasks
to run this mode of the concurrency framework in Evergreen.
-rw-r--r-- | buildscripts/resmokeconfig/suites/concurrency.yml | 3 | ||||
-rw-r--r-- | etc/evergreen.yml | 76 | ||||
-rw-r--r-- | jstests/concurrency/fsm_all_simultaneous.js | 16 |
3 files changed, 91 insertions, 4 deletions
diff --git a/buildscripts/resmokeconfig/suites/concurrency.yml b/buildscripts/resmokeconfig/suites/concurrency.yml index 52af5e99fa6..50a1ed5a655 100644 --- a/buildscripts/resmokeconfig/suites/concurrency.yml +++ b/buildscripts/resmokeconfig/suites/concurrency.yml @@ -6,6 +6,9 @@ selector: # Skip replication and sharding tests because they're run in different suites - jstests/concurrency/fsm_all_replication*.js - jstests/concurrency/fsm_all_sharded*.js + # Skip fsm_all_simultaneous.js to avoid triggering the 6-hour timeout in Evergreen when this + # suite is run with --repeat=10 on the Linux Repeated Execution variant. + - jstests/concurrency/fsm_all_simultaneous.js executor: js_test: diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 287dbd75ffb..6921b5c105a 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1416,6 +1416,22 @@ tasks: resmoke_args: --suites=concurrency_sharded --storageEngine=wiredTiger - <<: *task_template + name: concurrency_simultaneous + commands: + - func: "do setup" + - func: "run tests" + vars: + resmoke_args: --executor=concurrency jstests/concurrency/fsm_all_simultaneous.js --storageEngine=mmapv1 + +- <<: *task_template + name: concurrency_simultaneous_WT + commands: + - func: "do setup" + - func: "run tests" + vars: + resmoke_args: --executor=concurrency jstests/concurrency/fsm_all_simultaneous.js --storageEngine=wiredTiger + +- <<: *task_template name: rlp commands: - func: "do setup" @@ -2224,6 +2240,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: read_concern_majority_passthrough_WT - name: replicasets - name: replicasets_WT @@ -2281,6 +2299,8 @@ buildvariants: - name: concurrency_WT - name: concurrency_replication_WT - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: unittests - name: linux-64-debug @@ -2356,6 +2376,12 @@ buildvariants: - name: concurrency_sharded_WT distros: - rhel55 + - name: concurrency_simultaneous + distros: + - rhel55 + - name: concurrency_simultaneous_WT + distros: + - rhel55 - name: read_concern_majority_passthrough_WT - name: replicasets - name: replicasets_WT @@ -2433,6 +2459,7 @@ buildvariants: - name: concurrency - name: concurrency_replication - name: concurrency_sharded + - name: concurrency_simultaneous - name: replicasets - name: replicasets_auth - name: replication @@ -2487,6 +2514,7 @@ buildvariants: - name: concurrency_WT - name: concurrency_replication_WT - name: concurrency_sharded_WT + - name: concurrency_simultaneous_WT - name: replicasets_WT - name: replication_WT - name: sharding_WT @@ -2578,6 +2606,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replicasets_auth @@ -2683,6 +2713,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replicasets_auth @@ -2865,6 +2897,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replicasets_auth @@ -3027,6 +3061,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replication @@ -3126,6 +3162,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: read_concern_majority_passthrough_WT - name: replicasets - name: replicasets_WT @@ -3221,6 +3259,12 @@ buildvariants: - name: concurrency_sharded_WT distros: - windows-64-vs2013-compile + - name: concurrency_simultaneous + distros: + - windows-64-vs2013-compile + - name: concurrency_simultaneous_WT + distros: + - windows-64-vs2013-compile - name: read_concern_majority_passthrough_WT - name: replicasets - name: replicasets_WT @@ -3322,6 +3366,7 @@ buildvariants: - windows-64-vs2013-compile # Some workloads require a lot of memory, use a bigger machine for this suite. - name: concurrency_replication - name: concurrency_sharded + - name: concurrency_simultaneous - name: jsCore - name: jsCore_auth - name: jsCore_small_oplog @@ -3402,6 +3447,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replication @@ -3526,6 +3573,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replication @@ -3612,6 +3661,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: read_concern_majority_passthrough_WT - name: replicasets - name: replicasets_WT @@ -3812,6 +3863,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: dbtest - name: dbtest_WT - name: disk @@ -4038,6 +4091,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replicasets_auth @@ -4144,6 +4199,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replicasets_auth @@ -4250,6 +4307,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replicasets_auth @@ -4421,6 +4480,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: dbtest - name: dbtest_WT - name: disk @@ -4641,6 +4702,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replicasets_auth @@ -4797,6 +4860,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replicasets_auth @@ -4852,6 +4917,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: dbtest - name: dbtest_WT - name: disk @@ -5033,6 +5100,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replicasets_auth @@ -5099,6 +5168,7 @@ buildvariants: - rhel62-build # Some workloads require a lot of memory, use a bigger machine for this suite. - name: concurrency_replication - name: concurrency_sharded + - name: concurrency_simultaneous - name: dbtest - name: failpoints - name: failpoints_auth @@ -5175,6 +5245,7 @@ buildvariants: - rhel62-build # Some workloads require a lot of memory, use a bigger machine for this suite. - name: concurrency_replication - name: concurrency_sharded + - name: concurrency_simultaneous - name: dbtest - name: failpoints - name: failpoints_auth @@ -5271,6 +5342,7 @@ buildvariants: - name: concurrency - name: concurrency_replication - name: concurrency_sharded + - name: concurrency_simultaneous - name: replicasets - name: replicasets_auth - name: replication @@ -5323,6 +5395,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: dbtest - name: dbtest_WT - name: disk @@ -5506,6 +5580,8 @@ buildvariants: - name: concurrency_replication_WT - name: concurrency_sharded - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: replicasets - name: replicasets_WT - name: replicasets_auth diff --git a/jstests/concurrency/fsm_all_simultaneous.js b/jstests/concurrency/fsm_all_simultaneous.js index b19a8cf9e16..e50e48656f1 100644 --- a/jstests/concurrency/fsm_all_simultaneous.js +++ b/jstests/concurrency/fsm_all_simultaneous.js @@ -5,9 +5,17 @@ load('jstests/concurrency/fsm_libs/runner.js'); var dir = 'jstests/concurrency/fsm_workloads'; var blacklist = [ + // Disabled due to MongoDB restrictions and/or workload restrictions + + // These workloads implicitly assume that their tid ranges are [0, $config.threadCount). This + // isn't guaranteed to be true when they are run in parallel with other workloads. + 'list_indexes.js', + 'update_inc_capped.js', + + 'agg_group_external.js', // uses >100MB of data, which can overwhelm test hosts + 'agg_sort_external.js', // uses >100MB of data, which can overwhelm test hosts ].map(function(file) { return dir + '/' + file; }); -// SERVER-16196 re-enable executing workloads -// runWorkloadsInParallel(ls(dir).filter(function(file) { -// return !Array.contains(blacklist, file); -// })); +runWorkloadsInParallel(ls(dir).filter(function(file) { + return !Array.contains(blacklist, file); +})); |