From: Sergey Vasilenko <svasilenko@mirantis.com>
Date: Fri, 22 Aug 2014 12:35:19 +0000 (+0400)
Subject: prevent neutron-server init script for kill himself
X-Git-Tag: openstack-ci/fuel/2014.1.1/5.1.1
X-Git-Url: https://review.fuel-infra.org/gitweb?p=openstack-build%2Fneutron-build.git;a=commitdiff_plain;h=4d22b5fc3898183e24cc0fded71083175a00c1b5;hp=260bd4a3c572743488fdbeaa28afff28bb982219

prevent neutron-server init script for kill himself

Change-Id: Ic1a89581aab027a70a89a79f084a34e5c42288f2
Closes-Bug: #1355758
---

diff --git a/rpm/SOURCES/neutron-server.init b/rpm/SOURCES/neutron-server.init
index d545b8180..88c47be47 100644
--- a/rpm/SOURCES/neutron-server.init
+++ b/rpm/SOURCES/neutron-server.init
@@ -39,12 +39,17 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
-    if pgrep $prog-server &>/dev/null ; then
-        sleep 2
-        pgrep $prog-server &>/dev/null && \
-        killall $prog-server
-    fi
     retval=$?
+    sleep 2
+    tailsss=$(ps axf | grep  $prog-server | grep 'bin/python' | awk '{print $1}')
+    itersss=100
+    while [ ! -z $tailsss ] && [ $itersss -gt 0 ] ; do
+      kill $tailsss
+      retval=$?
+      sleep 2
+      tailsss=$(ps axf | grep  $prog-server | grep 'bin/python' | awk '{print $1}')
+      itersss=$(($itersss-1))
+    done
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
     return $retval