diff options
author | auto-revert-processor <dev-prod-dag@mongodb.com> | 2022-04-07 03:18:28 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-04-07 03:46:08 +0000 |
commit | 74076ecb661127f73990cfca898fcf9b914aabd5 (patch) | |
tree | 38fdc3a49d8eec47d494f00d2e43eea1fcd3f253 | |
parent | 22efa63dc6f320305c264b4f3e7fc5a2ab301361 (diff) | |
download | mongo-74076ecb661127f73990cfca898fcf9b914aabd5.tar.gz |
Revert "SERVER-64949: Disable the CST benchmark tests"
This reverts commit 0954e8a6694258ad4e19af052bf3bb329a8326fb.
-rw-r--r-- | buildscripts/benchmarks/threshold_config.yml | 3 | ||||
-rw-r--r-- | buildscripts/resmokeconfig/suites/benchmarks.yml | 4 | ||||
-rwxr-xr-x | buildscripts/resmokeconfig/suites/benchmarks_cst.yml | 23 | ||||
-rw-r--r-- | etc/evergreen_yml_components/definitions.yml | 23 |
4 files changed, 25 insertions, 28 deletions
diff --git a/buildscripts/benchmarks/threshold_config.yml b/buildscripts/benchmarks/threshold_config.yml index af707a83b45..8155b64381d 100644 --- a/buildscripts/benchmarks/threshold_config.yml +++ b/buildscripts/benchmarks/threshold_config.yml @@ -27,5 +27,4 @@ overrides: benchmarks: benchmarks_sharding: benchmarks_bsoncolumn: - # Disabled under SERVER-64949. - # benchmarks_cst: + benchmarks_cst: diff --git a/buildscripts/resmokeconfig/suites/benchmarks.yml b/buildscripts/resmokeconfig/suites/benchmarks.yml index 5bbd6e460ef..1bca113779c 100644 --- a/buildscripts/resmokeconfig/suites/benchmarks.yml +++ b/buildscripts/resmokeconfig/suites/benchmarks.yml @@ -11,8 +11,8 @@ selector: - build/install/bin/chunk_manager_refresh_bm* - build/install/bin/migration_chunk_cloner_source_legacy_bm* - build/install/bin/sharding_write_router_bm* - # These benchmarks included in the benchmarks_cst.yml test suite are disabled under SERVER-64949. - # - build/install/bin/cst_bm* + # These benchmarks are being run as part of the benchmarks_cst.yml test suite. + - build/install/bin/cst_bm* # These benchmarks are being run as part of the benchmarks_bsoncolumn.yml test suite. - build/install/bin/bsoncolumn_bm* - build/install/bin/simple8b_bm* diff --git a/buildscripts/resmokeconfig/suites/benchmarks_cst.yml b/buildscripts/resmokeconfig/suites/benchmarks_cst.yml index 3dcf67c6925..610cc691d2f 100755 --- a/buildscripts/resmokeconfig/suites/benchmarks_cst.yml +++ b/buildscripts/resmokeconfig/suites/benchmarks_cst.yml @@ -1,16 +1,15 @@ -# Disabled under SERVER-64949.
# This benchmark computes the performance of the grammar-based bison parser, which involves
# building a concrete syntax tree (CST) and translating to the relevant execution tree.
-# test_kind: benchmark_test
+test_kind: benchmark_test
-# selector:
-# root: build/benchmarks.txt
-# include_files:
-# # The trailing asterisk is for handling the .exe extension on Windows.
-# - build/**/system_resource_canary_bm*
-# - build/install/bin/cst_bm*
+selector:
+ root: build/benchmarks.txt
+ include_files:
+ # The trailing asterisk is for handling the .exe extension on Windows.
+ - build/**/system_resource_canary_bm*
+ - build/install/bin/cst_bm*
-# executor:
-# config: {}
-# hooks:
-# - class: CombineBenchmarkResults
+executor:
+ config: {}
+ hooks:
+ - class: CombineBenchmarkResults
diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index 44cf83058a9..0610d693f8e 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -3157,18 +3157,17 @@ tasks: - func: "send benchmark results" - func: "analyze benchmark results" -# Disabled under SERVER-64949. -# - <<: *benchmark_template -# name: benchmarks_cst -# tags: ["benchmarks"] -# commands: -# - func: "do benchmark setup" -# - func: "run tests" -# vars: -# suite: benchmarks_cst -# resmoke_jobs_max: 1 -# - func: "send benchmark results" -# - func: "analyze benchmark results" +- <<: *benchmark_template + name: benchmarks_cst + tags: ["benchmarks"] + commands: + - func: "do benchmark setup" + - func: "run tests" + vars: + suite: benchmarks_cst + resmoke_jobs_max: 1 + - func: "send benchmark results" + - func: "analyze benchmark results" - <<: *run_jepsen_template name: jepsen_register_findAndModify |