diff options
-rw-r--r-- | buildscripts/resmokeconfig/suites/serial_run.yml (renamed from buildscripts/resmokeconfig/suites/slow2.yml) | 2 | ||||
-rwxr-xr-x | buildscripts/smoke.py | 4 | ||||
-rw-r--r-- | etc/evergreen.yml | 113 | ||||
-rw-r--r-- | jstests/noPassthrough/cursor_timeout.js (renamed from jstests/slow2/cursor_timeout.js) | 0 | ||||
-rw-r--r-- | jstests/replsets/replsets_killop.js (renamed from jstests/slow2/replsets_killop.js) | 0 | ||||
-rw-r--r-- | jstests/serial_run/README | 2 | ||||
-rw-r--r-- | jstests/serial_run/election_timing.js (renamed from jstests/slow1/election_timing.js) | 0 | ||||
-rw-r--r-- | jstests/serial_run/memory.js (renamed from jstests/slow1/memory.js) | 0 | ||||
-rw-r--r-- | jstests/slow1/conc_update.js (renamed from jstests/slow2/conc_update.js) | 0 | ||||
-rw-r--r-- | jstests/slow1/mr_during_migrate.js (renamed from jstests/slow2/mr_during_migrate.js) | 0 | ||||
-rw-r--r-- | jstests/slow1/remove_during_mr.js (renamed from jstests/slow2/remove_during_mr.js) | 0 | ||||
-rw-r--r-- | jstests/slow2/32bit.js | 146 |
12 files changed, 61 insertions, 206 deletions
diff --git a/buildscripts/resmokeconfig/suites/slow2.yml b/buildscripts/resmokeconfig/suites/serial_run.yml index 0fcad31255f..4ae010c7ec8 100644 --- a/buildscripts/resmokeconfig/suites/slow2.yml +++ b/buildscripts/resmokeconfig/suites/serial_run.yml @@ -1,7 +1,7 @@ selector: js_test: roots: - - jstests/slow2/*.js + - jstests/serial_run/*.js executor: js_test: diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py index d2add18cafd..46e375f4846 100755 --- a/buildscripts/smoke.py +++ b/buildscripts/smoke.py @@ -931,7 +931,7 @@ suiteGlobalConfig = {"js": ("core/*.js", True), "gle": ("gle/*.js", True), "rocksDB": ("rocksDB/*.js", True), "slow1": ("slow1/*.js", True), - "slow2": ("slow2/*.js", True), + "serial_run": ("serial_run/*.js", True), } def get_module_suites(): @@ -1006,7 +1006,7 @@ def expand_suites(suites,expandUseDB=True): 'auth', 'sharding', 'slow1', - 'slow2', + 'serial_run', 'tool'], expandUseDB=expandUseDB) if suite == 'dbtest' or suite == 'test': diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 73882e452dd..366cd2cea35 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1259,22 +1259,21 @@ tasks: run_multiple_jobs: true - <<: *task_template - name: slow2 + name: serial_run commands: - func: "do setup" - func: "run tests" vars: - resmoke_args: --suites=slow2 --storageEngine=mmapv1 - run_multiple_jobs: true + resmoke_args: --suites=serial_run --storageEngine=mmapv1 + run_multiple_jobs: false - <<: *task_template - name: slow2_WT + name: serial_run_WT commands: - func: "do setup" - func: "run tests" vars: - resmoke_args: --suites=slow2 --storageEngine=wiredTiger - # No parallelization of jobs due to memory constraints and WiredTiger cache size. + resmoke_args: --suites=serial_run --storageEngine=wiredTiger run_multiple_jobs: false - <<: *task_template @@ -2282,8 +2281,8 @@ buildvariants: - name: sharding_auth - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough @@ -2421,8 +2420,8 @@ buildvariants: - name: sharding_auth - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough @@ -2493,7 +2492,7 @@ buildvariants: - name: sharding - name: sharding_auth - name: slow1 - - name: slow2 + - name: serial_run - name: sharding_jscore_passthrough - name: tool - name: unittests @@ -2544,7 +2543,7 @@ buildvariants: - name: replication_WT - name: sharding_WT - name: slow1_WT - - name: slow2_WT + - name: serial_run_WT - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough_WT - name: sharding_jscore_passthrough_wire_ops_WT @@ -2645,8 +2644,8 @@ buildvariants: - name: sharding_last_stable_mongos - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharding_jscore_passthrough - name: sharding_jscore_passthrough_WT - name: ssl @@ -2752,8 +2751,8 @@ buildvariants: - name: sharding_last_stable_mongos - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharding_jscore_passthrough - name: sharding_jscore_passthrough_WT - name: ssl @@ -2826,8 +2825,8 @@ buildvariants: - name: sharding_WT_ese - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough @@ -2936,8 +2935,8 @@ buildvariants: - name: sharding_last_stable_mongos - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough @@ -3096,8 +3095,8 @@ buildvariants: - name: sharding_WT - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough @@ -3198,8 +3197,8 @@ buildvariants: - name: sharding_WT - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough @@ -3487,8 +3486,8 @@ buildvariants: - name: sharding_WT - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough @@ -3619,8 +3618,8 @@ buildvariants: - name: sharding_WT - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough @@ -3714,8 +3713,8 @@ buildvariants: - name: sharding_WT - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharding_jscore_passthrough - name: sharding_jscore_passthrough_WT - name: ssl @@ -3997,8 +3996,8 @@ buildvariants: - name: sharding_csrs_continuous_config_stepdown_WT - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: snmp - name: snmp_WT - name: ssl @@ -4154,8 +4153,8 @@ buildvariants: - name: sharding_auth - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharding_jscore_passthrough - name: sharding_jscore_passthrough_WT - name: sharding_last_stable_mongos @@ -4262,8 +4261,8 @@ buildvariants: - name: sharding_auth - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharding_jscore_passthrough - name: sharding_jscore_passthrough_WT - name: sharding_last_stable_mongos @@ -4370,8 +4369,8 @@ buildvariants: - name: sharding_auth - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharding_jscore_passthrough - name: sharding_jscore_passthrough_WT - name: sharding_last_stable_mongos @@ -4606,8 +4605,8 @@ buildvariants: - name: sharding_op_query_WT - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: snmp - name: snmp_WT - name: ssl @@ -4768,8 +4767,8 @@ buildvariants: - name: sharding_last_stable_mongos - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharding_jscore_passthrough - name: sharding_jscore_passthrough_WT - name: ssl @@ -4926,8 +4925,8 @@ buildvariants: - name: sharding_last_stable_mongos - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharding_jscore_passthrough - name: sharding_jscore_passthrough_WT - name: ssl @@ -5008,8 +5007,8 @@ buildvariants: - name: sharding_WT - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: tool - name: tool_WT - name: unittests @@ -5217,8 +5216,8 @@ buildvariants: - name: sharding_last_stable_mongos - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough @@ -5329,8 +5328,8 @@ buildvariants: - name: sharding_last_stable_mongos - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough @@ -5427,7 +5426,7 @@ buildvariants: - name: sharding_jscore_passthrough_wire_ops_WT - name: sharding_op_query_WT - name: slow1 - - name: slow2 + - name: serial_run - name: snmp - name: ssl - name: sslSpecial @@ -5499,7 +5498,7 @@ buildvariants: - name: sharding_auth - name: sharding_op_query_WT - name: slow1 - - name: slow2 + - name: serial_run - name: sharded_collections_jscore_passthrough - name: sharding_jscore_passthrough - name: sharding_jscore_passthrough_wire_ops_WT @@ -5563,7 +5562,7 @@ buildvariants: - name: sharding - name: sharding_auth - name: slow1 - - name: slow2 + - name: serial_run - name: sharding_jscore_passthrough - name: unittests @@ -5685,8 +5684,8 @@ buildvariants: - name: sharding_op_query_WT - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: snmp - name: snmp_WT - name: ssl @@ -5808,8 +5807,8 @@ buildvariants: - name: sharding_last_stable_mongos - name: slow1 - name: slow1_WT - - name: slow2 - - name: slow2_WT + - name: serial_run + - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT - name: sharding_jscore_passthrough diff --git a/jstests/slow2/cursor_timeout.js b/jstests/noPassthrough/cursor_timeout.js index f74521b9bc9..f74521b9bc9 100644 --- a/jstests/slow2/cursor_timeout.js +++ b/jstests/noPassthrough/cursor_timeout.js diff --git a/jstests/slow2/replsets_killop.js b/jstests/replsets/replsets_killop.js index ea1cd560b91..ea1cd560b91 100644 --- a/jstests/slow2/replsets_killop.js +++ b/jstests/replsets/replsets_killop.js diff --git a/jstests/serial_run/README b/jstests/serial_run/README new file mode 100644 index 00000000000..73bc3344f1d --- /dev/null +++ b/jstests/serial_run/README @@ -0,0 +1,2 @@ +This suite contains tests that are unusually susceptible to availability of machine resources; +therefore, this suite is always run with --jobs=1 via Evergreen config.
\ No newline at end of file diff --git a/jstests/slow1/election_timing.js b/jstests/serial_run/election_timing.js index 2fe83be02ed..2fe83be02ed 100644 --- a/jstests/slow1/election_timing.js +++ b/jstests/serial_run/election_timing.js diff --git a/jstests/slow1/memory.js b/jstests/serial_run/memory.js index 9d67aa7aab6..9d67aa7aab6 100644 --- a/jstests/slow1/memory.js +++ b/jstests/serial_run/memory.js diff --git a/jstests/slow2/conc_update.js b/jstests/slow1/conc_update.js index b7b8b836831..b7b8b836831 100644 --- a/jstests/slow2/conc_update.js +++ b/jstests/slow1/conc_update.js diff --git a/jstests/slow2/mr_during_migrate.js b/jstests/slow1/mr_during_migrate.js index cb439aeb241..cb439aeb241 100644 --- a/jstests/slow2/mr_during_migrate.js +++ b/jstests/slow1/mr_during_migrate.js diff --git a/jstests/slow2/remove_during_mr.js b/jstests/slow1/remove_during_mr.js index 9b632a11a56..9b632a11a56 100644 --- a/jstests/slow2/remove_during_mr.js +++ b/jstests/slow1/remove_during_mr.js diff --git a/jstests/slow2/32bit.js b/jstests/slow2/32bit.js deleted file mode 100644 index d8b2c5ff728..00000000000 --- a/jstests/slow2/32bit.js +++ /dev/null @@ -1,146 +0,0 @@ -// 32bit.js dm - -// Use Random.rand() and helpers, not Math.random() - -var abortSlowHost = true; -var forceSeedToBe = null; - -if (forceSeedToBe) { - print("\n32bit.js WARNING FORCING A SPECIFIC SEED"); - print("seed=" + forceSeedToBe); - Random.srand(forceSeedToBe); -} else { - Random.setRandomSeed(); -} - -function f() { - 'use strict'; - - var pass = 1; - var mydb = db.getSisterDB("test_32bit"); - var t = mydb.colltest_32bit; - - mydb.dropDatabase(); - - while (1) { - if (pass >= 2) { - break; - } - print("32bit.js PASS #" + pass); - pass++; - - t.insert({x: 1}); - t.ensureIndex({a: 1}); - t.ensureIndex({b: 1}, true); - t.ensureIndex({x: 1}); - if (Random.rand() < 0.3) { - t.ensureIndex({c: 1}); - } - t.ensureIndex({d: 1}); - t.ensureIndex({e: 1}); - t.ensureIndex({f: 1}); - - // create 448 byte string - var big = 'a b'; - big = big + big; - big = big + big; - big = big + big; - big = big + big; - - var a = 0; - var c = 'kkk'; - var start = new Date(); - var b, d, f, cc; - - while (1) { - // Insert: - // a: number, integer count of documents inserted - // b: number, random in range [0.0, 1.0) - // c: null (10% chance) or string big (90% chance) - // d: string "kkk-<value of a>" - // f: number, a + random in range [0.0, 1.0) - - b = Random.rand(); - d = c + -a; - f = Random.rand() + a; - a++; - cc = big; - if (Random.rand() < 0.1) { - cc = null; - } - - var res = t.insert({a: a, b: b, c: cc, d: d, f: f}); - if (res.hasWriteError()) { - // Presumably we have mmap error on 32 bit. try a few more manipulations - // attempting to break things. - t.insert({a: 33, b: 44, c: 55, d: 66, f: 66}); - t.insert({a: 33, b: 44000, c: 55, d: 66}); - t.insert({a: 33, b: 440000, c: 55}); - t.insert({a: 33, b: 4400000}); - t.update({a: 20}, {'$set': {c: 'abc'}}); - t.update({a: 21}, {'$set': {c: 'aadsfbc'}}); - t.update({a: 22}, {'$set': {c: 'c'}}); - t.update({a: 23}, {'$set': {b: cc}}); - t.remove({a: 22}); - break; - } - - if (Random.rand() < 0.01) { - t.remove({a: a}); - t.remove({b: Random.rand()}); - t.insert({e: 1}); - t.insert({f: 'aaaaaaaaaa'}); - - if (Random.rand() < 0.00001) { - print("remove cc"); - t.remove({c: cc}); - } - if (Random.rand() < 0.0001) { - print("update cc"); - t.update({c: cc}, {'$set': {c: 1}}, false, true); - } - if (Random.rand() < 0.00001) { - print("remove e"); - t.remove({e: 1}); - } - } - if (a == 20000) { - var delta_ms = (new Date()) - start; - // 2MM / 20000 = 100. 1000ms/sec. - var eta_secs = delta_ms * (100 / 1000); - print("32bit.js eta_secs:" + eta_secs); - if (eta_secs > 1000 && abortSlowHost) { - print("32bit.js machine is slow, stopping early. a:" + a); - mydb.dropDatabase(); - return; - } - } - if (a % 100000 == 0) { - print(a); - // on 64 bit we won't error out, so artificially stop. on 32 bit we will hit - // mmap limit ~1.6MM but may vary by a factor of 2x by platform - if (a >= 2200000) { - mydb.dropDatabase(); - return; - } - } - } - print("count: " + t.count()); - - var res = t.validate(); - if (!res.valid) { - print("32bit.js FAIL validating"); - print(res.result); - printjson(res); - // mydb.dropDatabase(); - throw Error("fail validating 32bit.js"); - } - - mydb.dropDatabase(); - } - - print("32bit.js SUCCESS"); -} - -print("\n32bit.js running - this test is slow."); -f(); |