diff --git a/be/src/common/config.h b/be/src/common/config.h index 136ccc408f..994ee6376d 100644 --- a/be/src/common/config.h +++ b/be/src/common/config.h @@ -106,7 +106,7 @@ DECLARE_Int32(brpc_num_threads); // Declare a selection strategy for those servers have many ips. // Note that there should at most one ip match this list. -// this is a list in semicolon-delimited format, in CIDR notation, e.g. 10.10.10.0/24 +// This is a list in semicolon-delimited format, in CIDR notation, e.g. 10.10.10.0/24 // If no ip match this rule, will choose one randomly. DECLARE_String(priority_networks); diff --git a/regression-test/pipeline/tpch/tpch-sf100/deploy.sh b/regression-test/pipeline/tpch/tpch-sf100/deploy.sh index 1ff17ebfba..d018b6df1a 100644 --- a/regression-test/pipeline/tpch/tpch-sf100/deploy.sh +++ b/regression-test/pipeline/tpch/tpch-sf100/deploy.sh @@ -45,8 +45,8 @@ if [[ -z "${teamcity_build_checkoutDir}" || exit 1 fi if ${DEBUG:-false}; then - pull_request_id="26344" - commit_id="97ee15f75e88f5af6de308d948361eaa7c261602" + pull_request_id="26465" + commit_id="a532f7113f463e144e83918a37288f2649448482" fi echo "#### Deploy Doris ####" @@ -124,8 +124,8 @@ echo "#### 6. check if need backup doris logs" if ${need_backup_doris_logs}; then print_doris_fe_log print_doris_be_log - if archive_doris_logs "${DORIS_HOME}/${pull_request_id}_${commit_id}_doris_logs.tar.gz"; then - upload_doris_log_to_oss "${DORIS_HOME}/${pull_request_id}_${commit_id}_doris_logs.tar.gz" + if file_name=$(archive_doris_logs "${pull_request_id}_${commit_id}_doris_logs.tar.gz"); then + upload_doris_log_to_oss "${file_name}" fi fi diff --git a/regression-test/pipeline/tpch/tpch-sf100/run.sh b/regression-test/pipeline/tpch/tpch-sf100/run.sh index fa3afdf7ef..dc02918124 100644 --- a/regression-test/pipeline/tpch/tpch-sf100/run.sh +++ b/regression-test/pipeline/tpch/tpch-sf100/run.sh @@ -135,8 +135,8 @@ echo "#### 5. check if need backup doris logs" if [[ ${exit_flag} != "0" ]]; then print_doris_fe_log print_doris_be_log - if archive_doris_logs "${DORIS_HOME}/${pull_request_id}_${commit_id}_doris_logs.tar.gz"; then - upload_doris_log_to_oss "${DORIS_HOME}/${pull_request_id}_${commit_id}_doris_logs.tar.gz" + if file_name=$(archive_doris_logs "${pull_request_id}_${commit_id}_doris_logs.tar.gz"); then + upload_doris_log_to_oss "${file_name}" fi fi