From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 23 Jul 2015 07:05:33 +0000 (+0800)
Subject: init-ceph: don't use procfs to check if daemon is running
X-Git-Tag: v9.1.0~259^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4594adbc8f08a7a5f124914d401020924bdc3e05;p=ceph.git

init-ceph: don't use procfs to check if daemon is running

use ps(1) instead, which is portable

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 82a4fd5e889c..22f595ad2b51 100755
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -61,8 +61,8 @@ signal_daemon() {
     [ -z "$action" ] && action="Stopping"
     printf "$action Ceph $name on $host..."
     do_cmd "if [ -e $pidfile ]; then
-        pid=`cat $pidfile`
-        if [ -e /proc/\$pid ] && grep -q $daemon /proc/\$pid/cmdline ; then
+        pid=\`cat $pidfile\`
+        if ps -p \$pid -o args= | grep -q $daemon; then
 	    cmd=\"kill $signal \$pid\"
 	    printf \"\$cmd...\"
 	    \$cmd
@@ -78,7 +78,7 @@ daemon_is_running() {
     pidfile=$4
     do_cmd "[ -e $pidfile ] || exit 1   # no pid, presumably not running
 	pid=\`cat $pidfile\`
-	[ -e /proc/\$pid ] && grep -q $daemon /proc/\$pid/cmdline && grep -qwe -i.$daemon_id /proc/\$pid/cmdline && exit 0 # running
+	ps -p \$pid -o args= | grep $daemon | grep -qwe -i.$daemon_id && exit 0 # running
         exit 1  # pid is something else" "" "okfail"
 }
 
@@ -92,7 +92,7 @@ stop_daemon() {
     printf "$action Ceph $name on $host..."
     do_cmd "if [ -e $pidfile ] ; then 
 	pid=\`cat $pidfile\`
-	while [ -e /proc/\$pid ] && grep -q $daemon /proc/\$pid/cmdline ; do
+	while ps -p \$pid -o args= | grep -q $daemon; do
 	    cmd=\"kill $signal \$pid\"
 	    printf \"\$cmd...\"
 	    \$cmd