From 9834ea96edb2eb9a8fef4cd7bcb0af83d5630006 Mon Sep 17 00:00:00 2001
From: liuzhanfeng2 <liuzhanfeng2@huawei.com>
Date: Mon, 15 Jan 2024 19:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9dms=5Fcontrl.sh=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E4=B8=ADclean=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/gausskernel/ddes/script/dms_contrl.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/gausskernel/ddes/script/dms_contrl.sh b/src/gausskernel/ddes/script/dms_contrl.sh
index 5c14aadf5..1842488f6 100644
--- a/src/gausskernel/ddes/script/dms_contrl.sh
+++ b/src/gausskernel/ddes/script/dms_contrl.sh
@@ -236,8 +236,15 @@ function Check()
 function Clean()
 {
     log "stop ${GSDB_BIN}..."
-    kill_program ${GSDB_BIN} ${GSDB_HOME}
-    sleep 3
+    ${BIN_PATH}/gs_ctl stop -D ${GSDB_HOME}
+
+    if [ $? -eq 0 ]
+    then
+        log "${GSDB_BIN} stopped in dir ${GSDB_HOME}..."
+    else
+        log "Killing ${GSDB_BIN} if running..."
+        kill_program ${GSDB_BIN} ${GSDB_HOME}
+    fi
 }
 
 function Main()