Merge lp:~gnuoy/ubuntu/trusty/ceph/1477225 into lp:ubuntu/trusty-proposed/ceph

[Liam Young]

[lp:~gnuoy/ubuntu/trusty/ceph/1477225]

68. By Liam Young on 2015-09-07

Use git patch for traceablility

69. By Liam Young on 2015-09-07

Use git patch (not plain diff) for traceablility

=== added directory '.pc/1cca0c1.patch'
=== added file '.pc/1cca0c1.patch/.timestamp'
=== added directory '.pc/1cca0c1.patch/src'
=== added file '.pc/1cca0c1.patch/src/init-radosgw'
--- .pc/1cca0c1.patch/src/init-radosgw	1970-01-01 00:00:00 +0000
+++ .pc/1cca0c1.patch/src/init-radosgw	2015-09-07 14:18:40 +0000
@@ -0,0 +1,98 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          radosgw
+# Required-Start:    $remote_fs $named $network $time
+# Required-Stop:     $remote_fs $named $network $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: radosgw RESTful rados gateway
+# Description: radosgw RESTful rados gateway
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/bin
+
+. /lib/lsb/init-functions
+
+daemon_is_running() {
+    daemon=$1
+    if pidof $daemon >/dev/null; then
+        echo "$daemon is running."
+        exit 0
+    else
+        echo "$daemon is not running."
+        exit 1
+    fi
+}
+
+VERBOSE=0
+for opt in $*; do
+    if [ "$opt" = "-v" ] || [ "$opt" = "--verbose" ]; then
+       VERBOSE=1
+    fi
+done
+
+# prefix for radosgw instances in ceph.conf
+PREFIX='client.radosgw.'
+
+# user to run radosgw as (it not specified in ceph.conf)
+DEFAULT_USER='root'
+
+RADOSGW=`which radosgw`
+if [ ! -x "$RADOSGW" ]; then
+    [ $VERBOSE -eq 1 ] && echo "$RADOSGW could not start, it is not executable."
+    exit 1
+fi
+
+case "$1" in
+    start)
+        for name in `ceph-conf --list-sections $PREFIX`;
+        do
+            auto_start=`ceph-conf -n $name 'auto start'`
+            if [ "$auto_start" = "no" ] || [ "$auto_start" = "false" ] || [ "$auto_start" = "0" ]; then
+                continue
+            fi
+
+            # mapped to this host?
+            host=`ceph-conf -n $name host`
+            hostname=`hostname -s`
+            if [ "$host" != "$hostname" ]; then
+                [ $VERBOSE -eq 1 ] && echo "hostname $hostname could not be found in ceph.conf:[$name], not starting."
+                continue
+            fi
+
+            user=`ceph-conf -n $name user`
+            if [ -z "$user" ]; then
+                user="$DEFAULT_USER"
+            fi
+
+            log_file=`$RADOSGW -n $name --show-config-value log_file`
+            if [ -n "$log_file" ] && [ ! -e "$log_file" ]; then
+                touch "$log_file"
+                chown $user $log_file
+            fi
+
+            echo "Starting $name..."
+            start-stop-daemon --start -u $user -x $RADOSGW -- -n $name
+        done
+        daemon_is_running $RADOSGW
+        ;;
+    reload)
+        echo "Reloading $name..."
+        start-stop-daemon --stop --signal HUP -x $RADOSGW --oknodo
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        ;;
+    stop)
+        start-stop-daemon --stop -x $RADOSGW --oknodo
+        ;;
+    status)
+        daemon_is_running $RADOSGW
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart|force-reload|reload|status} [-v|--verbose]" >&2
+        exit 3
+        ;;
+esac
+

=== added file '.pc/1cca0c1.patch/src/init-radosgw.sysv'
--- .pc/1cca0c1.patch/src/init-radosgw.sysv	1970-01-01 00:00:00 +0000
+++ .pc/1cca0c1.patch/src/init-radosgw.sysv	2015-09-07 14:18:40 +0000
@@ -0,0 +1,112 @@
+#! /bin/bash
+### BEGIN INIT INFO
+# Provides:          radosgw
+# Required-Start:    $remote_fs $named $network $time
+# Required-Stop:     $remote_fs $named $network $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: radosgw RESTful rados gateway
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/bin
+
+#. /lib/lsb/init-functions
+. /etc/rc.d/init.d/functions
+
+daemon_is_running() {
+    daemon=$1
+    sleep 1
+    if pidof $daemon >/dev/null; then
+        echo "$daemon is running."
+        exit 0
+    else
+        echo "$daemon is not running."
+        exit 1
+    fi
+}
+
+VERBOSE=0
+for opt in $*; do
+    if [ "$opt" = "-v" ] || [ "$opt" = "--verbose" ]; then
+       VERBOSE=1
+    fi
+done
+
+# prefix for radosgw instances in ceph.conf
+PREFIX='client.radosgw.'
+
+# user to run radosgw as (it not specified in ceph.conf)
+#DEFAULT_USER='www-data'
+DEFAULT_USER='root'
+
+RADOSGW=`which radosgw`
+if [ ! -x "$RADOSGW" ]; then
+    [ $VERBOSE -eq 1 ] && echo "$RADOSGW could not start, it is not executable."
+    exit 1
+fi
+
+# detect systemd
+SYSTEMD=0
+grep -qs systemd /proc/1/comm && SYSTEMD=1
+
+case "$1" in
+    start)
+        echo "Starting radosgw instance(s)..."
+        for name in `ceph-conf --list-sections $PREFIX`;
+        do
+            auto_start=`ceph-conf -n $name 'auto start'`
+            if [ "$auto_start" = "no" ] || [ "$auto_start" = "false" ] || [ "$auto_start" = "0" ]; then
+                continue
+            fi
+
+            # mapped to this host?
+            host=`ceph-conf -n $name host`
+            hostname=`hostname -s`
+            if [ "$host" != "$hostname" ]; then
+                [ $VERBOSE -eq 1 ] && echo "hostname $hostname could not be found in ceph.conf:[$name], not starting."
+                continue
+            fi
+
+            user=`ceph-conf -n $name user`
+            if [ -z "$user" ]; then
+                user="$DEFAULT_USER"
+            fi
+
+            log_file=`$RADOSGW -n $name --show-config-value log_file`
+            if [ -n "$log_file" ] && [ ! -e "$log_file" ]; then
+                touch "$log_file"
+                chown $user $log_file
+            fi
+
+            if [ $SYSTEMD -eq 1 ]; then
+                systemd-run -r sudo -u "$user" bash -c "ulimit -n 32768; $RADOSGW -n $name"
+            else
+		ulimit -n 32768
+                daemon --user="$user" "$RADOSGW -n $name"
+            fi
+            echo "Starting $name..."
+        done
+        daemon_is_running $RADOSGW
+        ;;
+    reload)
+        #start-stop-daemon --signal HUP -x $RADOSGW --oknodo
+        killproc $RADOSGW -SIGHUP
+        echo "Reloading radosgw instance(s)..."
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        ;;
+    stop)
+        #start-stop-daemon --stop -x $RADOSGW --oknodo
+        killproc $RADOSGW
+        echo "Stopping radosgw instance(s)..."
+        ;;
+    status)
+        daemon_is_running $RADOSGW
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart|force-reload|reload|status} [-v|--verbose]" >&2
+        exit 3
+        ;;
+esac

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2015-08-10 11:00:44 +0000
+++ .pc/applied-patches	2015-09-07 14:18:40 +0000
@@ -2,3 +2,4 @@
 modules.patch
 increaseFileLimit.patch
 zap-in-two-phases.patch
+1cca0c1.patch

=== added file '.pc/increaseFileLimit.patch/.timestamp'
=== added file '.pc/modules.patch/.timestamp'
=== added file '.pc/virtualenv-never-download/.timestamp'
=== added file '.pc/zap-in-two-phases.patch/.timestamp'
=== modified file 'debian/changelog'
--- debian/changelog	2015-08-10 11:00:44 +0000
+++ debian/changelog	2015-09-07 14:18:40 +0000
@@ -1,3 +1,10 @@
+ceph (0.80.10-0ubuntu1.14.04.4) UNRELEASED; urgency=medium
+
+  * Fix stop init script target. (LP: #1477225)
+    - d/p/1cca0c1.patch
+
+ -- Liam Young <[e-mail]>  Mon, 07 Sep 2015 15:12:04 +0100
+
 ceph (0.80.10-0ubuntu1.14.04.2) trusty; urgency=medium
 
   * Switch to two step 'zapping' of disks, ensuring that disks with invalid

=== added file 'debian/patches/1cca0c1.patch'
--- debian/patches/1cca0c1.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/1cca0c1.patch	2015-09-07 14:18:40 +0000
@@ -0,0 +1,60 @@
+From 1cca0c1e91a1e18f82f4d22855e96b2fc947f5ea Mon Sep 17 00:00:00 2001
+From: Dmitry Yatsushkevich <[e-mail]>
+Date: Tue, 17 Mar 2015 15:44:52 -0700
+Subject: [PATCH] rgw: init script waits until the radosgw stops
+
+Fixes: #11140
+Init script waits in stop action until the radowgw daemons stop.
+
+Signed-off-by: Dmitry Yatsushkevich <[e-mail]>
+---
+ src/init-radosgw      | 10 +++++++++-
+ src/init-radosgw.sysv | 11 +++++++++++
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/src/init-radosgw b/src/init-radosgw
+index 1ef71c4..8c4b6b8 100644
+--- a/src/init-radosgw
++++ b/src/init-radosgw
+@@ -93,7 +93,15 @@ case "$1" in
+         $0 start
+         ;;
+     stop)
+-        start-stop-daemon --stop -x $RADOSGW --oknodo
++        timeout=0
++        for name in `ceph-conf --list-sections $PREFIX`;
++        do
++          t=`$RADOSGW -n $name --show-config-value rgw_exit_timeout_secs`
++          if [ $t -gt $timeout ]; then timeout=$t; fi
++        done
++
++        if [ $timeout -gt 0 ]; then TIMEOUT="-R $timeout"; fi
++        start-stop-daemon --stop -x $RADOSGW --oknodo $TIMEOUT
+         ;;
+     status)
+         daemon_is_running $RADOSGW
+diff --git a/src/init-radosgw.sysv b/src/init-radosgw.sysv
+index e210b79..91d994d 100644
+--- a/src/init-radosgw.sysv
++++ b/src/init-radosgw.sysv
+@@ -107,8 +107,19 @@ case "$1" in
+         ;;
+     stop)
+         #start-stop-daemon --stop -x $RADOSGW --oknodo
++        timeout=0
++        for name in `ceph-conf --list-sections $PREFIX`;
++        do
++          t=`$RADOSGW -n $name --show-config-value rgw_exit_timeout_secs`
++          if [ $t -gt $timeout ]; then timeout=$t; fi
++        done
++
+         killproc $RADOSGW
+         echo "Stopping radosgw instance(s)..."
++        while pidof $RADOSGW >/dev/null && [ $timeout -gt 0 ] ; do
++          sleep 1
++          timeout=$(($timeout - 1))
++        done
+         ;;
+     status)
+         daemon_is_running $RADOSGW
+

=== added file 'debian/patches/init-script-stop.patch'
--- debian/patches/init-script-stop.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/init-script-stop.patch	2015-09-07 14:18:40 +0000
@@ -0,0 +1,21 @@
+Index: ceph/src/init-radosgw
+===================================================================
+--- ceph.orig/src/init-radosgw
++++ ceph/src/init-radosgw
+@@ -85,7 +85,15 @@ case "$1" in
+         $0 start
+         ;;
+     stop)
+-        start-stop-daemon --stop -x $RADOSGW --oknodo
++        timeout=0
++        for name in `ceph-conf --list-sections $PREFIX`;
++        do
++          t=`$RADOSGW -n $name --show-config-value rgw_exit_timeout_secs`
++          if [ $t -gt $timeout ]; then timeout=$t; fi
++        done
++
++        if [ $timeout -gt 0 ]; then TIMEOUT="-R $timeout"; fi
++        start-stop-daemon --stop -x $RADOSGW --oknodo $TIMEOUT
+         ;;
+     status)
+         daemon_is_running $RADOSGW

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-08-10 11:00:44 +0000
+++ debian/patches/series	2015-09-07 14:18:40 +0000
@@ -2,3 +2,4 @@
 modules.patch
 increaseFileLimit.patch
 zap-in-two-phases.patch
+1cca0c1.patch

=== modified file 'src/init-radosgw'
--- src/init-radosgw	2015-07-22 17:12:16 +0000
+++ src/init-radosgw	2015-09-07 14:18:40 +0000
@@ -85,7 +85,15 @@
         $0 start
         ;;
     stop)
-        start-stop-daemon --stop -x $RADOSGW --oknodo
+        timeout=0
+        for name in `ceph-conf --list-sections $PREFIX`;
+        do
+          t=`$RADOSGW -n $name --show-config-value rgw_exit_timeout_secs`
+          if [ $t -gt $timeout ]; then timeout=$t; fi
+        done
+
+        if [ $timeout -gt 0 ]; then TIMEOUT="-R $timeout"; fi
+        start-stop-daemon --stop -x $RADOSGW --oknodo $TIMEOUT
         ;;
     status)
         daemon_is_running $RADOSGW

=== modified file 'src/init-radosgw.sysv'
--- src/init-radosgw.sysv	2015-07-22 17:12:16 +0000
+++ src/init-radosgw.sysv	2015-09-07 14:18:40 +0000
@@ -99,8 +99,19 @@
         ;;
     stop)
         #start-stop-daemon --stop -x $RADOSGW --oknodo
+        timeout=0
+        for name in `ceph-conf --list-sections $PREFIX`;
+        do
+          t=`$RADOSGW -n $name --show-config-value rgw_exit_timeout_secs`
+          if [ $t -gt $timeout ]; then timeout=$t; fi
+        done
+
         killproc $RADOSGW
         echo "Stopping radosgw instance(s)..."
+        while pidof $RADOSGW >/dev/null && [ $timeout -gt 0 ] ; do
+          sleep 1
+          timeout=$(($timeout - 1))
+        done
         ;;
     status)
         daemon_is_running $RADOSGW