This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit f94ff21eefd754ac03bd76420ecb52e6f65da76c Author: Dongyang Li <hello_step...@qq.com> AuthorDate: Thu Jan 11 19:00:12 2024 +0800 [ci](perf) adjust threshold (#29856) Co-authored-by: stephen <hello-step...@qq.com> --- regression-test/pipeline/performance/run-clickbench.sh | 9 +++++---- regression-test/pipeline/performance/run-load.sh | 16 ++++++++-------- regression-test/pipeline/performance/run-tpcds.sh | 9 +++++---- regression-test/pipeline/performance/run-tpch.sh | 9 +++++---- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/regression-test/pipeline/performance/run-clickbench.sh b/regression-test/pipeline/performance/run-clickbench.sh index 0016a6a68cb..f0c36e31781 100644 --- a/regression-test/pipeline/performance/run-clickbench.sh +++ b/regression-test/pipeline/performance/run-clickbench.sh @@ -256,12 +256,13 @@ exit_flag=0 echo "#### 5. run clickbench query" sed -i '/^run_sql \"analyze table hits with sync;\"/d' "${teamcity_build_checkoutDir}"/tools/clickbench-tools/run-clickbench-queries.sh bash "${teamcity_build_checkoutDir}"/tools/clickbench-tools/run-clickbench-queries.sh - cold_run_time_threshold=${cold_run_time_threshold:-666} # 单位 秒 - hot_run_time_threshold=${hot_run_time_threshold:-52} # 单位 秒 + cold_run_time_threshold=${cold_run_time_threshold_master:-120} # 单位 秒 + hot_run_time_threshold=${hot_run_time_threshold_master:-34} # 单位 秒 if [[ "${target_branch}" == "branch-2.0" ]]; then - cold_run_time_threshold=${cold_run_time_threshold:-666} # 单位 秒 - hot_run_time_threshold=${hot_run_time_threshold:-55} # 单位 秒 + cold_run_time_threshold=${cold_run_time_threshold_branch20:-110} # 单位 秒 + hot_run_time_threshold=${hot_run_time_threshold_branch20:-34} # 单位 秒 fi + echo "INFO: cold_run_time_threshold is ${cold_run_time_threshold}, hot_run_time_threshold is ${hot_run_time_threshold}" # result.csv 来自 run-clickbench-queries.sh 的产出 if ! check_clickbench_performance_result result.csv; then exit 1; fi if ! (cd clickbench && bash check-query-result.sh && cd -); then exit 1; fi diff --git a/regression-test/pipeline/performance/run-load.sh b/regression-test/pipeline/performance/run-load.sh index 570ab87616b..3fa930cbc88 100644 --- a/regression-test/pipeline/performance/run-load.sh +++ b/regression-test/pipeline/performance/run-load.sh @@ -663,15 +663,15 @@ exit_flag=0 if ! insert_into_select; then exit 1; fi echo "#### 3. check load performance" - stream_load_json_speed_threshold=${stream_load_json_speed_threshold:-100} # 单位 MB/s - stream_load_orc_speed_threshold=${stream_load_orc_speed_threshold:-10} # 单位 MB/s - stream_load_parquet_speed_threshold=${stream_load_parquet_speed_threshold:-10} # 单位 MB/s - insert_into_select_speed_threshold=${insert_into_select_speed_threshold:-310} # 单位 Krows/s + stream_load_json_speed_threshold=${stream_load_json_speed_threshold_master:-115} # 单位 MB/s + stream_load_orc_speed_threshold=${stream_load_orc_speed_threshold_master:-15} # 单位 MB/s + stream_load_parquet_speed_threshold=${stream_load_parquet_speed_threshold_master:-22} # 单位 MB/s + insert_into_select_speed_threshold=${insert_into_select_speed_threshold_master:-700} # 单位 Krows/s if [[ "${target_branch}" == "branch-2.0" ]]; then - stream_load_json_speed_threshold=${stream_load_json_speed_threshold:-100} # 单位 MB/s - stream_load_orc_speed_threshold=${stream_load_orc_speed_threshold:-10} # 单位 MB/s - stream_load_parquet_speed_threshold=${stream_load_parquet_speed_threshold:-10} # 单位 MB/s - insert_into_select_speed_threshold=${insert_into_select_speed_threshold:-310} # 单位 Krows/s + stream_load_json_speed_threshold=${stream_load_json_speed_threshold_branch20:-105} # 单位 MB/s + stream_load_orc_speed_threshold=${stream_load_orc_speed_threshold_branch20:-15} # 单位 MB/s + stream_load_parquet_speed_threshold=${stream_load_parquet_speed_threshold_branch20:-22} # 单位 MB/s + insert_into_select_speed_threshold=${insert_into_select_speed_threshold_branch20:-410} # 单位 Krows/s fi if [[ ${stream_load_json_speed} -lt ${stream_load_json_speed_threshold} ]]; then echo "ERROR: stream_load_json_speed ${stream_load_json_speed} is less than the threshold ${stream_load_json_speed_threshold}" && exit 1; fi if [[ ${stream_load_orc_speed} -lt ${stream_load_orc_speed_threshold} ]]; then echo "ERROR: stream_load_json_speed ${stream_load_orc_speed} is less than the threshold ${stream_load_orc_speed_threshold}" && exit 1; fi diff --git a/regression-test/pipeline/performance/run-tpcds.sh b/regression-test/pipeline/performance/run-tpcds.sh index 18776025723..d054b85ee4d 100644 --- a/regression-test/pipeline/performance/run-tpcds.sh +++ b/regression-test/pipeline/performance/run-tpcds.sh @@ -125,12 +125,13 @@ exit_flag=0 echo "#### 3. run tpcds-sf${SF} query" set_session_variable runtime_filter_mode global bash "${teamcity_build_checkoutDir}"/tools/tpcds-tools/bin/run-tpcds-queries.sh -s "${SF}" | tee "${teamcity_build_checkoutDir}"/run-tpcds-queries.log - cold_run_time_threshold=${cold_run_time_threshold:-600000} # ms - hot_run_time_threshold=${hot_run_time_threshold:-240000} # ms + cold_run_time_threshold=${cold_run_time_threshold_master:-315000} # ms + hot_run_time_threshold=${hot_run_time_threshold_master:-190000} # ms if [[ "${target_branch}" == "branch-2.0" ]]; then - cold_run_time_threshold=${cold_run_time_threshold:-600000} # ms - hot_run_time_threshold=${hot_run_time_threshold:-300000} # ms + cold_run_time_threshold=${cold_run_time_threshold_branch20:-370000} # ms + hot_run_time_threshold=${hot_run_time_threshold_branch20:-260000} # ms fi + echo "INFO: cold_run_time_threshold is ${cold_run_time_threshold}, hot_run_time_threshold is ${hot_run_time_threshold}" if ! check_tpcds_result "${teamcity_build_checkoutDir}"/run-tpcds-queries.log; then exit 1; fi line_end=$(sed -n '/^Total hot run time/=' "${teamcity_build_checkoutDir}"/run-tpcds-queries.log) line_begin=$((line_end - 100)) diff --git a/regression-test/pipeline/performance/run-tpch.sh b/regression-test/pipeline/performance/run-tpch.sh index f0c92e31dc2..1620c5f2922 100644 --- a/regression-test/pipeline/performance/run-tpch.sh +++ b/regression-test/pipeline/performance/run-tpch.sh @@ -117,12 +117,13 @@ exit_flag=0 echo "#### 3. run tpch-sf${SF} query" set_session_variable runtime_filter_mode global bash "${teamcity_build_checkoutDir}"/tools/tpch-tools/bin/run-tpch-queries.sh -s "${SF}" | tee "${teamcity_build_checkoutDir}"/run-tpch-queries.log - cold_run_time_threshold=${cold_run_time_threshold:-200000} # ms - hot_run_time_threshold=${hot_run_time_threshold:-50000} # ms + cold_run_time_threshold=${cold_run_time_threshold_master:-120000} # ms + hot_run_time_threshold=${hot_run_time_threshold_master:-42000} # ms if [[ "${target_branch}" == "branch-2.0" ]]; then - cold_run_time_threshold=${cold_run_time_threshold:-200000} # ms - hot_run_time_threshold=${hot_run_time_threshold:-100000} # ms + cold_run_time_threshold=${cold_run_time_threshold_branch20:-130000} # ms + hot_run_time_threshold=${hot_run_time_threshold_branch20:-55000} # ms fi + echo "INFO: cold_run_time_threshold is ${cold_run_time_threshold}, hot_run_time_threshold is ${hot_run_time_threshold}" if ! check_tpch_result "${teamcity_build_checkoutDir}"/run-tpch-queries.log; then exit 1; fi line_end=$(sed -n '/^Total hot run time/=' "${teamcity_build_checkoutDir}"/run-tpch-queries.log) line_begin=$((line_end - 23)) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org