Hello community,
here is the log from the commit of package multipath-tools for
openSUSE:Leap:15.2 checked in at 2020-06-10 16:49:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/multipath-tools (Old)
and /work/SRC/openSUSE:Leap:15.2/.multipath-tools.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "multipath-tools"
Wed Jun 10 16:49:56 2020 rev:79 rq:813047 version:0.8.2+18.9ff73e7
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/multipath-tools/multipath-tools.changes
2020-01-15 15:31:35.582783477 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.multipath-tools.new.3606/multipath-tools.changes
2020-06-10 16:50:02.332382443 +0200
@@ -1,0 +2,7 @@
+Mon Jun 8 15:30:19 UTC 2020 - Martin Wilck <[email protected]>
+
+- Remove 0%{?is_opensuse} from spec file (jsc#SLE-11854)
+- Fix udev rule processing during coldplug (bsc#1172157)
+ * Add patch: 11-dm-mpath.rules-Fix-udev-rule-processing-during-co.patch
+
+-------------------------------------------------------------------
New:
----
11-dm-mpath.rules-Fix-udev-rule-processing-during-co.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ multipath-tools.spec ++++++
--- /var/tmp/diff_new_pack.6Nvc0j/_old 2020-06-10 16:50:02.860383974 +0200
+++ /var/tmp/diff_new_pack.6Nvc0j/_new 2020-06-10 16:50:02.860383974 +0200
@@ -1,7 +1,7 @@
#
# spec file for package multipath-tools
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,31 +15,13 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-
-# Workaround for Leap 42.1 bug, bsc#940315
-%if 0%{?suse_version} == 1315
-%if 0%{?is_opensuse} == 1
-%if 0%{?sle_version} == 0
-%define sle_version 120100
-%endif
-%endif
-%endif
-
# Whether to build libdmmp
-# Default YES on openSUSE factory, SLE15, and leap
-# Default NO on SLES 12
-# Always NO on other distros
-%if 0%{?suse_version} == 1315
-%if 0%{?is_opensuse} == 1
+# Default YES except for SLE12 / Leap 42
+%if 0%{?suse_version} >= 1500
%bcond_without libdmmp
-%else # 0%{?is_opensuse} == 1
+%else
%bcond_with libdmmp
-%endif # 0%{?is_opensuse} == 1
-%else # 0%{?is_opensuse} == 1
-%if 0%{?suse_version} >= 1330
-%bcond_without libdmmp
-%endif # 0%{?suse_version} >= 1330
-%endif # 0%{?suse_version} == 1315
+%endif
# This should match the version in libdmmp/Makefile
%define _libdmmp_version 0.2.0
@@ -63,6 +45,7 @@
Source3: dm-parts.conf
Source4: libmpathpersist-example.c
Patch01: libmultipath-set-enable_foreign-to-NONE-by-default.patch
+Patch02: 11-dm-mpath.rules-Fix-udev-rule-processing-during-co.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
BuildRequires: device-mapper-devel
++++++ 11-dm-mpath.rules-Fix-udev-rule-processing-during-co.patch ++++++
>From 383c003aee4072e7636e211c51ee9f214e72991b Mon Sep 17 00:00:00 2001
From: Martin Wilck <[email protected]>
Date: Fri, 29 May 2020 23:33:37 +0200
Subject: [PATCH] 11-dm-mpath.rules: Fix udev rule processing during coldplug
DM_SUBSYSTEM_UDEV_FLAG0 is used to indicate that upper layer
udev rules don't need to be processed for multipath maps, e.g.
for map reloads.
However, this can fail if maps were created during initrd processing,
but udev processing for the change events of these maps didn't
complete because udevd was killed to switch root. So, in the coldplug
case, play safe and process the rules once more.
Reviewed-by: Benjamin Marzinski <[email protected]>
Signed-off-by: Martin Wilck <[email protected]>
---
multipath/11-dm-mpath.rules | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/multipath/11-dm-mpath.rules b/multipath/11-dm-mpath.rules
index 07320a1..98d94f9 100644
--- a/multipath/11-dm-mpath.rules
+++ b/multipath/11-dm-mpath.rules
@@ -52,8 +52,13 @@ LABEL="mpath_action"
# something that should be reacted upon since it would be useless extra work.
# It's exactly mpath's job to provide *seamless* device access to any of the
# paths that are available underneath.
+# Exception: On cold-plug, if the map had already been set up before,
+# do process upper layers, because rule processing may not necessarily have
+# completed during initrd processing.
+ACTION=="add", ENV{.MPATH_DEVICE_READY_OLD}=="1", GOTO="process_reload"
ENV{DM_SUBSYSTEM_UDEV_FLAG0}=="1", \
ENV{DM_ACTIVATION}="0", ENV{MPATH_UNCHANGED}="1"
+LABEL="process_reload"
# For path failed or reinstated events, unset DM_ACTIVATION.
# This is similar to the DM_SUBSYSTEM_UDEV_FLAG0 case above.
--
2.26.2
