Package: memcached
Version: 1.4.7-0.1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* d/p/50_add_init_retry.patch: use --retry to wait up to 5 seconds
for memcached to die. (LP: #795673)
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-12-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== added file 'debian/patches/50_add_init_retry.patch'
--- debian/patches/50_add_init_retry.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/50_add_init_retry.patch 2012-02-09 23:34:46 +0000
@@ -0,0 +1,31 @@
+Author: Clint Byrum <cl...@ubuntu.com>
+Description: Uses --retry to wait up to 5 seconds for the killed process to die.
+Bug-Ubuntu: http://pad.lv/795673
+Bug: http://code.google.com/p/memcached/issues/detail?id=250
+Forwarded: yes, http://code.google.com/p/memcached/issues/detail?id=250
+
+Index: memcached/scripts/memcached-init
+===================================================================
+--- memcached.orig/scripts/memcached-init 2012-02-09 15:07:20.834152608 -0800
++++ memcached/scripts/memcached-init 2012-02-09 15:22:44.424307457 -0800
+@@ -92,7 +92,7 @@
+ ;;
+ stop)
+ echo -n "Stopping $DESC: "
+- start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
++ start-stop-daemon --stop --quiet --oknodo --retry 5 --pidfile $PIDFILE --exec $DAEMON
+ echo "$NAME."
+ rm -f $PIDFILE
+ ;;
+@@ -104,10 +104,9 @@
+ # just the same as "restart".
+ #
+ echo -n "Restarting $DESC: "
+- start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
++ start-stop-daemon --stop --quiet --oknodo --retry 5 --pidfile $PIDFILE
+ rm -f $PIDFILE
+ if [ $ENABLE_MEMCACHED = yes ]; then
+- sleep 1
+ start-stop-daemon --start --quiet --exec "$DAEMONBOOTSTRAP" -- /etc/${NAME}.conf $PIDFILE
+ echo "$NAME."
+ else
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-10-18 11:16:01 +0000
+++ debian/patches/series 2012-02-09 22:13:17 +0000
@@ -1,3 +1,4 @@
01_init_script_additions.patch
02_manpage_additions.patch
03_fix_ftbfs4hurd.patch
+50_add_init_retry.patch
