Merge lp:~serge-hallyn/ubuntu/maverick/multipath-tools/fix-crash-on-shutdown into lp:ubuntu/maverick/multipath-tools

[Serge Hallyn]

[Barry Warsaw (barry)]

Although I cannot test whether this fixes the bug or not, the patch looks good to me. It mirrors the related change in the Debian package, and the package builds successfully. I cannot upload the change, but I'll approve the merge proposal. Perhaps James can do the upload.

It looks like the natty version of the package is lagging behind the Debian version. Perhaps a sync request is in order?

review: Approve

Unmerged revisions

35. By Serge Hallyn on 2010-09-16

Apply patch from debian to fix multipathd crash on
shutdown (LP: #488285)

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-08 14:50:04 +0000
+++ debian/changelog	2010-09-16 15:02:47 +0000
@@ -1,3 +1,10 @@
+multipath-tools (0.4.8-14ubuntu5) maverick; urgency=low
+
+  * Apply patch from debian to fix multipathd crash on
+    shutdown (LP: #488285)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 16 Sep 2010 09:55:22 -0500
+
 multipath-tools (0.4.8-14ubuntu4) lucid; urgency=low
 
   * debian/control: Move libreadline5-dev build dependency to libreadline-dev.

=== added file 'debian/patches/0013-multipathd-crash-on-shutdown.patch'
--- debian/patches/0013-multipathd-crash-on-shutdown.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0013-multipathd-crash-on-shutdown.patch	2010-09-16 15:02:47 +0000
@@ -0,0 +1,27 @@
+From: Hannes Reinecke <[e-mail]>
+Date: Wed, 30 Apr 2008 11:03:24 +0200
+Subject: [PATCH] multipathd crash on shutdown
+
+On shutdown multipathd flushes its internal message queue;
+but we have to check if the messages on the queue are not empty.
+
+Signed-off-by: Hannes Reinecke <[e-mail]>
+---
+ libmultipath/log_pthread.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libmultipath/log_pthread.c b/libmultipath/log_pthread.c
+index 5a82b6a..8976bfb 100644
+--- a/libmultipath/log_pthread.c
++++ b/libmultipath/log_pthread.c
+@@ -33,7 +33,8 @@ static void flush_logqueue (void)
+ 		pthread_mutex_lock(logq_lock);
+ 		empty = log_dequeue(la->buff);
+ 		pthread_mutex_unlock(logq_lock);
+-		log_syslog(la->buff);
++		if (!empty)
++			log_syslog(la->buff);
+ 	} while (empty == 0);
+ }
+ 
+-- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-02-12 11:52:22 +0000
+++ debian/patches/series	2010-09-16 15:02:47 +0000
@@ -12,3 +12,4 @@
 0012--libmultipath-Update-discovery-to-work-with-new-sys.patch
 1000--set-umask-in-multipathd.patch
 1001--intel-mpath-prio-alua.patch
+0013-multipathd-crash-on-shutdown.patch