diff options
author | Etienne Petrel <etienne.petrel@mongodb.com> | 2021-12-21 06:20:18 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-21 07:25:59 +0000 |
commit | 4a07aa30df0f675673cb2fdb1aeb7eb24af457d1 (patch) | |
tree | 05eaabb71bee7f7b56008a3542141b2f300e1e1a | |
parent | 72643ec8e86ce68fe32a025588b5338441476a2a (diff) | |
download | mongo-4a07aa30df0f675673cb2fdb1aeb7eb24af457d1.tar.gz |
Import wiredtiger: efd9d9adf2af4d68383868c4bd5e156b19bca99b from branch mongodb-master
ref: ae980839bb..efd9d9adf2
for: 5.3.0
WT-8481 Split cppsuite search near tests and update their logging levels
5 files changed, 67 insertions, 9 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 352a91a9c77..06b83cbe4e6 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-master", - "commit": "ae980839bbe78bfc4291b82b36e4bf6e8c54744e" + "commit": "efd9d9adf2af4d68383868c4bd5e156b19bca99b" } diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/timestamp_manager.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/timestamp_manager.cxx index 8ac6e67c34c..ecb06ea93d8 100644 --- a/src/third_party/wiredtiger/test/cppsuite/test_harness/timestamp_manager.cxx +++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/timestamp_manager.cxx @@ -103,7 +103,7 @@ timestamp_manager::do_work() } if (!log_msg.empty()) - logger::log_msg(LOG_INFO, log_msg); + logger::log_msg(LOG_TRACE, log_msg); /* * Save the new timestamps. Any timestamps that we're viewing from another thread should be set diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cxx index 08eefb5bfaa..dccc53a08bf 100644 --- a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cxx +++ b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cxx @@ -185,7 +185,7 @@ class search_near_01 : public test_harness::test { /* Generate search prefix key of random length between a -> zzz. */ srch_key = random_generator::instance().generate_random_string( srchkey_len, characters_type::ALPHABET); - logger::log_msg(LOG_INFO, + logger::log_msg(LOG_TRACE, "Search near thread {" + std::to_string(tc->id) + "} performing prefix search near with key: " + srch_key); @@ -278,7 +278,7 @@ class search_near_01 : public test_harness::test { tc->stat_cursor, WT_STAT_CONN_CURSOR_NEXT_SKIP_LT_100, &entries_stat); runtime_monitor::get_stat( tc->stat_cursor, WT_STAT_CONN_CURSOR_SEARCH_NEAR_PREFIX_FAST_PATHS, &prefix_stat); - logger::log_msg(LOG_INFO, + logger::log_msg(LOG_TRACE, "Read thread skipped entries: " + std::to_string(entries_stat - prev_entries_stat) + " prefix early exit: " + std::to_string(prefix_stat - prev_prefix_stat - z_key_searches)); diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_03.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_03.cxx index 2286c87d334..fc660a97155 100644 --- a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_03.cxx +++ b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_03.cxx @@ -243,7 +243,7 @@ class search_near_03 : public test_harness::test { random_index = random_generator::instance().generate_integer( static_cast<size_t>(0), prefixes_map.at(coll.id).size() - 1); prefix_key = get_prefix_from_key(prefixes_map.at(coll.id).at(random_index)); - logger::log_msg(LOG_INFO, + logger::log_msg(LOG_TRACE, type_string(tc->type) + " thread: Perform unique index insertions with existing prefix key " + prefix_key + "."); diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index 7dba9fa74d0..84f398c6a99 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -1020,7 +1020,7 @@ tasks: ${test_env_vars|} $(pwd)/test/cppsuite/run -t hs_cleanup -C 'debug_mode=(cursor_copy=true)' -f test/cppsuite/configs/hs_cleanup_default.txt -l 2 - - name: cppsuite-search-near-default + - name: cppsuite-search-near-01-default tags: ["pull_request"] depends_on: - name: compile @@ -1034,7 +1034,35 @@ tasks: set -o verbose ${test_env_vars|} $(pwd)/test/cppsuite/run -t search_near_01 -f test/cppsuite/configs/search_near_01_default.txt -l 2 + + - name: cppsuite-search-near-02-default + tags: ["pull_request"] + depends_on: + - name: compile + commands: + - func: "fetch artifacts" + - command: shell.exec + params: + working_dir: "wiredtiger/build_posix/" + script: | + set -o errexit + set -o verbose + ${test_env_vars|} $(pwd)/test/cppsuite/run -t search_near_02 -f test/cppsuite/configs/search_near_02_default.txt -l 2 + + - name: cppsuite-search-near-03-default + tags: ["pull_request"] + depends_on: + - name: compile + commands: + - func: "fetch artifacts" + - command: shell.exec + params: + working_dir: "wiredtiger/build_posix/" + script: | + set -o errexit + set -o verbose + ${test_env_vars|} $(pwd)/test/cppsuite/run -t search_near_03 -f test/cppsuite/configs/search_near_03_default.txt -l 2 - name: cppsuite-base-test-stress @@ -1065,7 +1093,7 @@ tasks: ${test_env_vars|} $(pwd)/run -t hs_cleanup -f configs/hs_cleanup_stress.txt -l 2 - - name: cppsuite-search-near-stress + - name: cppsuite-search-near-01-stress depends_on: - name: compile commands: @@ -1078,7 +1106,33 @@ tasks: set -o verbose ${test_env_vars|} $(pwd)/test/cppsuite/run -t search_near_01 -f test/cppsuite/configs/search_near_01_stress.txt -l 2 + + - name: cppsuite-search-near-02-stress + depends_on: + - name: compile + commands: + - func: "fetch artifacts" + - command: shell.exec + params: + working_dir: "wiredtiger/build_posix/" + script: | + set -o errexit + set -o verbose + ${test_env_vars|} $(pwd)/test/cppsuite/run -t search_near_02 -f test/cppsuite/configs/search_near_02_stress.txt -l 2 + + - name: cppsuite-search-near-03-stress + depends_on: + - name: compile + commands: + - func: "fetch artifacts" + - command: shell.exec + params: + working_dir: "wiredtiger/build_posix/" + script: | + set -o errexit + set -o verbose + ${test_env_vars|} $(pwd)/test/cppsuite/run -t search_near_03 -f test/cppsuite/configs/search_near_03_stress.txt -l 2 # End of cppsuite test tasks. @@ -3943,7 +3997,9 @@ buildvariants: - name: make-check-test - name: cppsuite-base-test-default - name: cppsuite-hs-cleanup-default - - name: cppsuite-search-near-default + - name: cppsuite-search-near-01-default + - name: cppsuite-search-near-02-default + - name: cppsuite-search-near-03-default - name: ubuntu2004-compilers display_name: "! Ubuntu 20.04 Compilers" @@ -4105,7 +4161,9 @@ buildvariants: - name: compile - name: cppsuite-base-test-stress - name: cppsuite-hs-cleanup-stress - - name: cppsuite-search-near-stress + - name: cppsuite-search-near-01-stress + - name: cppsuite-search-near-02-stress + - name: cppsuite-search-near-03-stress - name: package display_name: "~ Package" |