Bug#904307: stretch-pu: package multipath-tools/0.6.4-5+deb9u1
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu
Dear Release Team,
The update would fix #859157, which is causing me headache on our production
servers. Basically multipathd just hangs randomly after some time.
This also includes changes to Vcs-*, Maintainer because the old values
are now invalid.
debdiff below.
Thanks,
Chris
diff -Nru multipath-tools-0.6.4/debian/changelog multipath-tools-0.6.4/debian/changelog
--- multipath-tools-0.6.4/debian/changelog 2017-03-25 09:33:08.000000000 +0000
+++ multipath-tools-0.6.4/debian/changelog 2018-07-23 06:16:34.000000000 +0000
@@ -1,3 +1,18 @@
+multipath-tools (0.6.4-5+deb9u1) stretch; urgency=medium
+
+ [ Chris Hofstaedtler ]
+ * Apply patch to avoid deadlock in udev triggers, based on upstream
+ 10704bae99cdcc809aaba0546017cb2eb416c551, with adaptions from
+ Alban Browaeys <prahal@yahoo.com> for 0.6.
+ (Closes: #859157)
+ * Add myself to Uploaders:.
+
+ [ Ritesh Raj Sarraf ]
+ * Use tracker as maintainer email address
+ * Switch packaging repository to Salsa (Closes: #899615)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Mon, 23 Jul 2018 06:16:34 +0000
+
multipath-tools (0.6.4-5) unstable; urgency=medium
* Ship multipath udev rules (Closes: #858456)
diff -Nru multipath-tools-0.6.4/debian/control multipath-tools-0.6.4/debian/control
--- multipath-tools-0.6.4/debian/control 2017-02-20 14:08:20.000000000 +0000
+++ multipath-tools-0.6.4/debian/control 2018-07-23 06:16:34.000000000 +0000
@@ -1,11 +1,11 @@
Source: multipath-tools
Section: admin
Priority: extra
-Maintainer: Debian LVM Team <pkg-lvm-maintainers@lists.alioth.debian.org>
-Uploaders: Guido Günther <agx@sigxcpu.org>, Ritesh Raj Sarraf <rrs@debian.org>
+Maintainer: Debian DM Multipath Team <team+linux-blocks@tracker.debian.org>
+Uploaders: Guido Günther <agx@sigxcpu.org>, Ritesh Raj Sarraf <rrs@debian.org>, Chris Hofstaedtler <zeha@debian.org>
Build-Depends: debhelper (>= 9), po-debconf, libdevmapper-dev (>= 2:1.02.20), libreadline-dev, libaio-dev, dpkg-dev (>= 1.16.1~), libudev-dev, libsystemd-dev, systemd, dh-systemd, liburcu-dev, librados-dev
-Vcs-Git: https://anonscm.debian.org/git/pkg-lvm/multipath-tools.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lvm/multipath-tools.git
+Vcs-Git: https://salsa.debian.org/linux-blocks-team/multipath-tools.git
+Vcs-Browser: https://salsa.debian.org/linux-blocks-team/multipath-tools.git
Standards-Version: 3.9.8
Homepage: http://christophe.varoqui.free.fr/
diff -Nru multipath-tools-0.6.4/debian/patches/multipathd_drop_lock_before_calling_uev_add_path.patch multipath-tools-0.6.4/debian/patches/multipathd_drop_lock_before_calling_uev_add_path.patch
--- multipath-tools-0.6.4/debian/patches/multipathd_drop_lock_before_calling_uev_add_path.patch 1970-01-01 00:00:00.000000000 +0000
+++ multipath-tools-0.6.4/debian/patches/multipathd_drop_lock_before_calling_uev_add_path.patch 2018-07-23 06:16:34.000000000 +0000
@@ -0,0 +1,45 @@
+This patch is based on:
+[PATCH 6/9] multipathd: drop lock before calling uev_add_path
+from Benjamin Marzinski <bmarzins@redhat.com>.
+
+commit c6a18f4541d0a161e2f5fed8c67d9732bf512b37 made uev_update_path
+call uev_add_path while holding the vecs lock, which is deadlocks, since
+uev_add_path grabs the vecs lock itself.
+
+The above patch was modified to cope with current release not yet including upstream commit
+ee8888f0dd0a74075431b5de90d60e0e90e27411
+("multipath-tools: improve processing efficiency for addition and deletion of multipath...")
+that adds a new parameter to uev_add_path.
+
+---
+ multipathd/main.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/multipathd/main.c
++++ b/multipathd/main.c
+@@ -960,6 +960,7 @@
+ struct path * pp;
+ struct config *conf;
+ int disable_changed_wwids;
++ int needs_reinit = 0;
+
+ conf = get_multipath_config();
+ disable_changed_wwids = conf->disable_changed_wwids;
+@@ -995,7 +996,7 @@
+ }
+
+ if (pp->initialized == INIT_REQUESTED_UDEV)
+- retval = uev_add_path(uev, vecs);
++ needs_reinit = 1;
+ else if (mpp && ro >= 0) {
+ condlog(2, "%s: update path write_protect to '%d' (uevent)", uev->kernel, ro);
+
+@@ -1013,6 +1014,8 @@
+ if (!pp)
+ condlog(0, "%s: spurious uevent, path not found", uev->kernel);
+
++ if (needs_reinit)
++ retval = uev_add_path(uev, vecs);
+ return retval;
+ }
+
diff -Nru multipath-tools-0.6.4/debian/patches/series multipath-tools-0.6.4/debian/patches/series
--- multipath-tools-0.6.4/debian/patches/series 2016-12-08 18:29:33.000000000 +0000
+++ multipath-tools-0.6.4/debian/patches/series 2018-07-23 06:16:34.000000000 +0000
@@ -5,3 +5,4 @@
systemd-alias.patch
disable-systemd-for-udeb.patch
disable-rados-link-for-udeb.patch
+multipathd_drop_lock_before_calling_uev_add_path.patch
Reply to: