diff options
author | Luke Chen <luke.chen@mongodb.com> | 2021-12-30 14:12:57 +1100 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-30 03:47:12 +0000 |
commit | 990abb79293b790cec2879ed138bb77019861db6 (patch) | |
tree | f4b549bdbbf331fbbf53c2bf5c48ea67b26cc234 | |
parent | d27c701f0895f2896c1513eb1edbadbf49602247 (diff) | |
download | mongo-990abb79293b790cec2879ed138bb77019861db6.tar.gz |
Import wiredtiger: 8a8be47507484ab8a6da038087e056c2ac86316f from branch mongodb-5.2
ref: 4b689baf5b..8a8be47507
for: 5.2.0-rc4
WT-8370 Add non timestamped configurations to data_validation_stress_test_args
-rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
-rw-r--r-- | src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c | 3 | ||||
-rwxr-xr-x | src/third_party/wiredtiger/test/evergreen.yml | 40 |
3 files changed, 38 insertions, 7 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 6e891ba87f8..169f860fdef 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-5.2", - "commit": "4b689baf5be226baf55ed383ce29d1e2475b377a" + "commit": "8a8be47507484ab8a6da038087e056c2ac86316f" } diff --git a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c index 5642dba5a78..8005046ca8e 100644 --- a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c +++ b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c @@ -547,11 +547,12 @@ usage(void) { fprintf(stderr, "usage: %s [-C wiredtiger-config] [-c checkpoint] [-h home] [-k keys]\n\t[-l log] [-m] " - "[-n ops] [-r runs] [-s 1|2|3|4] [-T table-config] [-t f|r|v]\n\t[-W workers]\n", + "[-n ops] [-r runs] [-s 1|2|3|4|5] [-T table-config] [-t f|r|v]\n\t[-W workers]\n", progname); fprintf(stderr, "%s", "\t-C specify wiredtiger_open configuration arguments\n" "\t-c checkpoint name to used named checkpoints\n" + "\t-D debug mode\n" "\t-h set a database home directory\n" "\t-k set number of keys to load\n" "\t-l specify a log file\n" diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index 7dba9fa74d0..d4cb0e9c2e4 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -2586,6 +2586,20 @@ tasks: script: | set -o errexit set -o verbose + ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args} -x" WT_TEST.$t' 120 + + - name: data-validation-stress-test-checkpoint-no-timestamp + depends_on: + - name: compile + commands: + - func: "fetch artifacts" + - command: shell.exec + params: + working_dir: "wiredtiger/build_posix/test/checkpoint" + shell: bash + script: | + set -o errexit + set -o verbose ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args}" WT_TEST.$t' 120 - name: data-validation-stress-test-checkpoint-fp-hs-insert-s1 @@ -2600,6 +2614,20 @@ tasks: script: | set -o errexit set -o verbose + ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args} -x -s 1" WT_TEST.$t' 120 + + - name: data-validation-stress-test-checkpoint-fp-hs-insert-s1-no-timestamp + depends_on: + - name: compile + commands: + - func: "fetch artifacts" + - command: shell.exec + params: + working_dir: "wiredtiger/build_posix/test/checkpoint" + shell: bash + script: | + set -o errexit + set -o verbose ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args} -s 1" WT_TEST.$t' 120 - name: data-validation-stress-test-checkpoint-fp-hs-insert-s2 @@ -2614,7 +2642,7 @@ tasks: script: | set -o errexit set -o verbose - ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args} -s 2" WT_TEST.$t' 120 + ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args} -x -s 2" WT_TEST.$t' 120 - name: data-validation-stress-test-checkpoint-fp-hs-insert-s3 depends_on: @@ -2628,7 +2656,7 @@ tasks: script: | set -o errexit set -o verbose - ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args} -s 3" WT_TEST.$t' 120 + ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args} -x -s 3" WT_TEST.$t' 120 - name: data-validation-stress-test-checkpoint-fp-hs-insert-s4 depends_on: @@ -2642,7 +2670,7 @@ tasks: script: | set -o errexit set -o verbose - ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args} -s 4" WT_TEST.$t' 120 + ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args} -x -s 4" WT_TEST.$t' 120 - name: data-validation-stress-test-checkpoint-fp-hs-insert-s5 depends_on: @@ -2656,7 +2684,7 @@ tasks: script: | set -o errexit set -o verbose - ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args} -s 5" WT_TEST.$t' 120 + ${test_env_vars|} ../../../tools/run_parallel.sh 'nice ../../../test/checkpoint/recovery-test.sh "${data_validation_stress_test_args} -x -s 5" WT_TEST.$t' 120 - name: format-failure-configs-test depends_on: @@ -3775,7 +3803,7 @@ buildvariants: --prefix=$(pwd)/LOCAL_INSTALL python_binary: '/opt/mongodbtoolchain/v3/bin/python3' make_command: PATH=/opt/mongodbtoolchain/v3/bin:$PATH make - data_validation_stress_test_args: -t r -m -W 3 -D -p -x -n 100000 -k 100000 -C cache_size=100MB + data_validation_stress_test_args: -t r -m -W 3 -D -p -n 100000 -k 100000 -C cache_size=100MB tasks: - name: ".pull_request !.windows_only !.pull_request_compilers" - name: linux-directio @@ -3797,7 +3825,9 @@ buildvariants: - name: format-smoke-test - name: format-failure-configs-test - name: data-validation-stress-test-checkpoint + - name: data-validation-stress-test-checkpoint-no-timestamp - name: data-validation-stress-test-checkpoint-fp-hs-insert-s1 + - name: data-validation-stress-test-checkpoint-fp-hs-insert-s1-no-timestamp - name: data-validation-stress-test-checkpoint-fp-hs-insert-s2 - name: data-validation-stress-test-checkpoint-fp-hs-insert-s3 - name: data-validation-stress-test-checkpoint-fp-hs-insert-s4 |