From: Yuval Lifshitz <yuvalif@yahoo.com>
Date: Wed, 27 Feb 2019 17:15:07 +0000 (+0200)
Subject: allow kill -9 after failing to kill procs
X-Git-Tag: v14.1.1~69^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6152a41ce96463cb9532db3c77033b2f7d49efe3;p=ceph.git

allow kill -9 after failing to kill procs

Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
---

diff --git a/src/mstop.sh b/src/mstop.sh
index 36daabe46817a..0dfe715e86b5b 100755
--- a/src/mstop.sh
+++ b/src/mstop.sh
@@ -27,6 +27,8 @@ else
   pfiles=`ls $pidpath/$entity.$id.pid` || true
 fi
 
+MAX_RETRIES=20
+
 for pidfile in $pfiles; do
   pid=`cat $pidfile`
   fname=`echo $pidfile | sed 's/.*\///g'`
@@ -38,11 +40,17 @@ for pidfile in $pfiles; do
   name=`echo $fname | sed 's/\.pid$//g'`
   [ "$entity" == "radosgw" ] && extra_check="-e lt-radosgw"
   echo entity=$entity pid=$pid name=$name
+  counter=0
+  signal=""
   while ps -p $pid -o args= | grep -q -e $entity $extracheck ; do
+    if [[ "$counter" -gt MAX_RETRIES ]]; then
+        signal="-9"
+    fi
     cmd="kill $signal $pid"
     printf "$cmd...\n"
     $cmd
     sleep 1
+    counter=$((counter+1))
     continue
   done
 done