diff --git a/src/gausskernel/ddes/ddes_commit_id b/src/gausskernel/ddes/ddes_commit_id index a428ef4e3..b93afcc9c 100644 --- a/src/gausskernel/ddes/ddes_commit_id +++ b/src/gausskernel/ddes/ddes_commit_id @@ -1,3 +1,3 @@ dms_commit_id=57edf641c1feb77c543cf5492dc70e9a3278b41a dss_commit_id=a9b6497b90790725d6ca684af8101f3d2e130d31 -cbb_commit_id=87bfb93353ba7838deb3611507edd4afe7058903 +cbb_commit_id=edfb66049990c4bc1e8ef084bc4b54181b3f3669 diff --git a/src/gausskernel/ddes/script/dss_contrl.sh b/src/gausskernel/ddes/script/dss_contrl.sh index c05a741ce..e6285a116 100644 --- a/src/gausskernel/ddes/script/dss_contrl.sh +++ b/src/gausskernel/ddes/script/dss_contrl.sh @@ -74,8 +74,17 @@ program_pid() program_pid2() { - pid=`ps -f f -u \`whoami\` | grep -w ${1} | grep -v grep | grep -v ${SCRIPT_NAME} | awk '{print $2}'` - echo ${pid} + pid=`ps -f -u \`whoami\` | grep -w ${1} | grep -v grep | grep -v ${SCRIPT_NAME} | awk '{print $2}'` + result="" + for p in ${pid}; do + ppid=`ps -o ppid= -p ${p}` + parent_name=`ps -p ${ppid} -o comm=` + if [ "${parent_name}" != "cm_server" ]; then + result="${result} ${p}" + fi + done + + echo ${result} } program_status()