From: Dan Mick <dan.mick@redhat.com>
Date: Fri, 19 Dec 2014 00:14:43 +0000 (-0800)
Subject: stop.sh: only try killing processes that belong to me
X-Git-Tag: v0.91~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b7585b31064fb808b189d417d3edaa2f76abdba;p=ceph.git

stop.sh: only try killing processes that belong to me

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/stop.sh b/src/stop.sh
index d7ce234c1fc..796940f8eae 100755
--- a/src/stop.sh
+++ b/src/stop.sh
@@ -20,10 +20,12 @@ test -d dev/osd0/. && test -e dev/sudo && SUDO="sudo"
 
 [ -z "$CEPH_BIN" ] && CEPH_BIN=.
 
+MYUID=$(id -u)
+
 do_killall() {
-    pg=`pgrep -f ceph-run.*$1`
+    pg=`pgrep -u $MYUID -f ceph-run.*$1`
     [ -n "$pg" ] && kill $pg
-    $SUDO killall $1
+    $SUDO killall -u $MYUID $1
 }
 
 usage="usage: $0 [all] [mon] [mds] [osd]\n"
@@ -75,16 +77,16 @@ if [ $stop_all -eq 1 ]; then
 
     for p in ceph-mon ceph-mds ceph-osd radosgw lt-radosgw apache2 ; do
         for try in 0 1 1 1 1 ; do
-            if ! pkill $p ; then
+            if ! pkill -u $MYUID $p ; then
                 break
             fi
             sleep $try
         done
     done
 
-    pkill -f valgrind.bin.\*ceph-mon
-    $SUDO pkill -f valgrind.bin.\*ceph-osd
-    pkill -f valgrind.bin.\*ceph-mds
+    pkill -u $MYUID -f valgrind.bin.\*ceph-mon
+    $SUDO pkill -u $MYUID -f valgrind.bin.\*ceph-osd
+    pkill -u $MYUID -f valgrind.bin.\*ceph-mds
 else
     [ $stop_mon -eq 1 ] && do_killall ceph-mon
     [ $stop_mds -eq 1 ] && do_killall ceph-mds