From 25d099109b912a1870d3492f84cb87b8a0da3164 Mon Sep 17 00:00:00 2001
From: zhangao_za <18829237393@163.com>
Date: Wed, 12 Jul 2023 14:16:19 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddms=E5=81=9C=E5=BA=93?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=AD=89=E5=BE=85=E6=97=B6=E9=97=B4=E4=B8=8E?=
 =?UTF-8?q?gs=5Fctl=20stop=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/gausskernel/ddes/script/dms_contrl.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gausskernel/ddes/script/dms_contrl.sh b/src/gausskernel/ddes/script/dms_contrl.sh
index 2e59beb08b..59c6273e72 100644
--- a/src/gausskernel/ddes/script/dms_contrl.sh
+++ b/src/gausskernel/ddes/script/dms_contrl.sh
@@ -188,7 +188,7 @@ function Stop()
 {
     log "stop ${GSDB_BIN}..."
     ${BIN_PATH}/gs_ctl stop -D ${GSDB_HOME}
-    sleep 5
+    sleep 60
 
     pid=`program_pid ${GSDB_BIN} ${GSDB_HOME}`
     if [[ -z ${pid} ]]
-- 
Gitee


From 4129ef4d6f84241c7c0020edccdad19b4b9c182b Mon Sep 17 00:00:00 2001
From: zhangao_za <18829237393@163.com>
Date: Wed, 12 Jul 2023 16:42:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bin/initdb/initdb.cpp                 |  2 +-
 src/gausskernel/ddes/script/dms_contrl.sh | 37 +++++++++++------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/bin/initdb/initdb.cpp b/src/bin/initdb/initdb.cpp
index 93eadcfb1d..6cd38ddef9 100644
--- a/src/bin/initdb/initdb.cpp
+++ b/src/bin/initdb/initdb.cpp
@@ -4663,7 +4663,7 @@ int main(int argc, char* argv[])
 
     // dss device init
     if (dss_device_init(socketpath, enable_dss) != DSS_SUCCESS) {
-        write_stderr(_("failed to init dss device.\n"));
+        write_stderr(_("failed to init dss device, check logs under $DSS_HOME for more information.\n"));
         exit_nicely();
     }
 
diff --git a/src/gausskernel/ddes/script/dms_contrl.sh b/src/gausskernel/ddes/script/dms_contrl.sh
index 59c6273e72..cbbd5bea7c 100644
--- a/src/gausskernel/ddes/script/dms_contrl.sh
+++ b/src/gausskernel/ddes/script/dms_contrl.sh
@@ -6,6 +6,7 @@ curr_path=`dirname $(readlink -f $0)`
 curr_filename=`basename $(readlink -f $0)`
 os_user=`whoami`
 file_user=`ls -l ${curr_path}"/${curr_filename}" | awk '{print $3}'`
+dms_log=/dev/null
 
 if [ ${file_user} != ${os_user} ]; then
     echo "Can't run ${curr_filename}, because it does not belong to the current user!"
@@ -46,6 +47,7 @@ log()
 {
     time=`date "+%Y-%m-%d %H:%M:%S"`
     echo "$time $1"
+    echo "$time $1" >> $dms_log
 }
 
 assert_empty()
@@ -108,6 +110,15 @@ function clear_script_log
     fi
 }
 
+touch_logfile()
+{
+    log_file=$1
+    if [ ! -f $log_file ]
+    then
+        touch $log_file
+    fi
+}
+
 check_log_file()
 {
     log_path=$1
@@ -116,22 +127,15 @@ check_log_file()
     # max log file size 16 * 1024 * 1024
     MAX_LOG_SIZE=16777216
     MAX_LOG_BACKUP=10
-    log_file_size=$(ls -l ${log_file} |awk '{print $5}')
     if [ -f ${log_file} ];then
+        log_file_size=$(ls -l ${log_file} | awk '{print $5}')
         if [ ${log_file_size} -ge ${MAX_LOG_SIZE} ];then
             mv -f ${log_file} "${log_path}/${operation}-`date +%Y-%m-%d_%H%M%S`.log" 2>/dev/null
             clear_script_log "${log_path}" "${operation}-" $MAX_LOG_BACKUP
         fi
     fi
-}
-
-touch_logfile()
-{
-    log_file=$1
-    if [ ! -f $log_file ]
-    then
-        touch $log_file
-    fi
+    touch_logfile $log_file
+    chmod 600 $log_file
 }
 
 assert_nonempty 1 ${1}
@@ -143,6 +147,9 @@ INSTANCE_ID=${2}
 GSDB_HOME=${3}
 CMD_PARAM=${4}
 
+dms_log=${GSDB_HOME}/DMSexec.log
+heck_log_file ${GSDB_HOME} $dms_log DMSexec
+
 if [ X${DSS_HOME} == X"" ]
 then
     log "ERROR! DSS_HOME cannot be null!"
@@ -156,14 +163,6 @@ function Start()
     db_start_log=${GSDB_HOME}/DBstart.log
     check_log_file ${GSDB_HOME} $db_start_log DBstart
 
-    if [[ -z "${GSDB_HOME}" ]]
-    then
-        db_start_log=/dev/null
-    else
-        touch_logfile $db_start_log
-        chmod 600 $db_start_log
-    fi
-
     dss_flag_file=instance_manual_start_$(expr $INSTANCE_ID + 20001 - 6001)
     if [[ -f $GAUSSHOME/bin/$dss_flag_file ]];
     then
@@ -188,7 +187,7 @@ function Stop()
 {
     log "stop ${GSDB_BIN}..."
     ${BIN_PATH}/gs_ctl stop -D ${GSDB_HOME}
-    sleep 60
+    sleep 5
 
     pid=`program_pid ${GSDB_BIN} ${GSDB_HOME}`
     if [[ -z ${pid} ]]
-- 
Gitee


From 855c1b5e929dad7c73aca2930f104f105f053d4f Mon Sep 17 00:00:00 2001
From: zhangao_za <18829237393@163.com>
Date: Wed, 12 Jul 2023 19:33:35 +0800
Subject: [PATCH 3/4] modify name

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

diff --git a/src/gausskernel/ddes/script/dms_contrl.sh b/src/gausskernel/ddes/script/dms_contrl.sh
index cbbd5bea7c..97c920cf4c 100644
--- a/src/gausskernel/ddes/script/dms_contrl.sh
+++ b/src/gausskernel/ddes/script/dms_contrl.sh
@@ -147,8 +147,8 @@ INSTANCE_ID=${2}
 GSDB_HOME=${3}
 CMD_PARAM=${4}
 
-dms_log=${GSDB_HOME}/DMSexec.log
-heck_log_file ${GSDB_HOME} $dms_log DMSexec
+dms_log=${GSDB_HOME}/dms_control.log
+heck_log_file ${GSDB_HOME} $dms_log dms_control
 
 if [ X${DSS_HOME} == X"" ]
 then
-- 
Gitee


From 4b50bd05f69b02db0d613869fc4cc02c966fe4b9 Mon Sep 17 00:00:00 2001
From: zhangao_za <18829237393@163.com>
Date: Wed, 12 Jul 2023 19:58:01 +0800
Subject: [PATCH 4/4] modify

---
 src/gausskernel/ddes/script/dms_contrl.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gausskernel/ddes/script/dms_contrl.sh b/src/gausskernel/ddes/script/dms_contrl.sh
index 97c920cf4c..8e2ec2a95c 100644
--- a/src/gausskernel/ddes/script/dms_contrl.sh
+++ b/src/gausskernel/ddes/script/dms_contrl.sh
@@ -148,7 +148,7 @@ GSDB_HOME=${3}
 CMD_PARAM=${4}
 
 dms_log=${GSDB_HOME}/dms_control.log
-heck_log_file ${GSDB_HOME} $dms_log dms_control
+check_log_file ${GSDB_HOME} $dms_log dms_control
 
 if [ X${DSS_HOME} == X"" ]
 then
-- 
Gitee