From a453afb54922b3cea64385d7083096135bd385cb Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Wed, 30 Aug 2023 01:18:03 +0530 Subject: [PATCH] mgr/dashboard: cleanup rbd-mirror process in dashboard e2e Fixes: https://tracker.ceph.com/issues/61703 Signed-off-by: Nizamudeen A --- src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh index 2c28835887272..a481a983f40bb 100755 --- a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh +++ b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh @@ -39,7 +39,7 @@ start_ceph() { # start rbd-mirror daemon in the cluster KEY=$(ceph auth get client.admin --format=json | jq -r .[0].key) MON_CLUSTER_1=$(grep "mon host" ${FULL_PATH_BUILD_DIR}/run/1/ceph.conf | awk '{print $4}') - ${FULL_PATH_BUILD_DIR}/bin/rbd-mirror --mon_host $MON_CLUSTER_1 --key $KEY -c ${FULL_PATH_BUILD_DIR}/run/1/ceph.conf & + ${FULL_PATH_BUILD_DIR}/bin/rbd-mirror --mon_host $MON_CLUSTER_1 --key $KEY -c ${FULL_PATH_BUILD_DIR}/run/1/ceph.conf set +x } @@ -50,6 +50,11 @@ stop() { for cluster in ${CLUSTERS[@]}; do ../src/mstop.sh $cluster done + pids=$(pgrep rbd-mirror) + if [ -n "$pids" ]; then + echo Killing rbd-mirror processes: $pids + kill -9 $pids + fi fi exit $1 } -- 2.39.5