This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new fdd2a7dd744 [ci](coverage) stop doris grace to generate converage file
(#50497)
fdd2a7dd744 is described below
commit fdd2a7dd7444dc3dee84b33eaa14b83964eca5fc
Author: Dongyang Li <[email protected]>
AuthorDate: Wed May 7 10:48:44 2025 +0800
[ci](coverage) stop doris grace to generate converage file (#50497)
---
regression-test/pipeline/cloud_p0/clean.sh | 2 +-
regression-test/pipeline/cloud_p0/run.sh | 2 +-
regression-test/pipeline/common/doris-utils.sh | 12 ++++++++++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/regression-test/pipeline/cloud_p0/clean.sh
b/regression-test/pipeline/cloud_p0/clean.sh
index 9707378e27b..82ac76136b8 100644
--- a/regression-test/pipeline/cloud_p0/clean.sh
+++ b/regression-test/pipeline/cloud_p0/clean.sh
@@ -26,5 +26,5 @@ if ${skip_pipeline:=false}; then echo "INFO: skip build
pipline" && exit 0; else
echo "#### Run tpcds test on Doris ####"
DORIS_HOME="${teamcity_build_checkoutDir}/output"
export DORIS_HOME
-stop_doris
+stop_doris_grace
clean_fdb "cloud_instance_0"
diff --git a/regression-test/pipeline/cloud_p0/run.sh
b/regression-test/pipeline/cloud_p0/run.sh
index 5eabe7d78a4..040e0a7b767 100644
--- a/regression-test/pipeline/cloud_p0/run.sh
+++ b/regression-test/pipeline/cloud_p0/run.sh
@@ -119,7 +119,7 @@ if [[ ${exit_flag} != "0" ]] || ${need_collect_log}; then
print_doris_fe_log
print_doris_be_log
fi
- stop_doris
+ stop_doris_grace
if log_file_name=$(archive_doris_logs
"${pr_num_from_trigger}_${commit_id_from_trigger}_$(date
+%Y%m%d%H%M%S)_doris_logs.tar.gz"); then
if log_info="$(upload_doris_log_to_oss "${log_file_name}")"; then
reporting_messages_error "${log_info##*logs.tar.gz to }"
diff --git a/regression-test/pipeline/common/doris-utils.sh
b/regression-test/pipeline/common/doris-utils.sh
index 2834f276952..b821ac3f9c6 100644
--- a/regression-test/pipeline/common/doris-utils.sh
+++ b/regression-test/pipeline/common/doris-utils.sh
@@ -216,6 +216,18 @@ function stop_doris() {
fi
}
+function stop_doris_grace() {
+ if [[ ! -d "${DORIS_HOME:-}" ]]; then return 1; fi
+ if [[ -f "${DORIS_HOME}"/ms/bin/stop.sh ]]; then bash
"${DORIS_HOME}"/ms/bin/stop.sh --grace; fi
+ if [[ -f "${DORIS_HOME}"/recycler/bin/stop.sh ]]; then bash
"${DORIS_HOME}"/recycler/bin/stop.sh --grace; fi
+ if "${DORIS_HOME}"/be/bin/stop_be.sh --grace &&
"${DORIS_HOME}"/fe/bin/stop_fe.sh --grace; then
+ echo "INFO: normally stoped doris"
+ else
+ pgrep -fi doris | xargs kill -9 &>/dev/null
+ echo "WARNING: force stoped doris"
+ fi
+}
+
function clean_fdb() {
instance_id="$1"
if [[ -z "${instance_id:-}" ]]; then return 1; fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
