From: Sage Weil <sage@redhat.com>
Date: Tue, 22 Sep 2015 18:12:02 +0000 (-0400)
Subject: init-radosgw: specify pid file to start-stop-daemon
X-Git-Tag: v9.1.0~87^2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e17c8e1a7a06db0e2680dedc7e954021610320d1;p=ceph.git

init-radosgw: specify pid file to start-stop-daemon

This fixes restart when multiple instances are running.

Fixes: #12407
Tested-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/init-radosgw b/src/init-radosgw
index 6fb8ba289056f..b7569a0aecc38 100644
--- a/src/init-radosgw
+++ b/src/init-radosgw
@@ -100,7 +100,7 @@ case "$1" in
 
             echo "Starting $name..."
 	    if [ $DEBIAN -eq 1 ]; then
-		start-stop-daemon --start -u $user -x $RADOSGW -- -n $name
+		start-stop-daemon --start -u $user -x $RADOSGW -p /var/run/ceph/client-$name.pid -- -n $name
 	    elif [ -n "$SYSTEMD_RUN" ]; then
                 $SYSTEMD_RUN -r su "$user" -c "ulimit -n 32768; $RADOSGW -n $name"
             else