import device-mapper-multipath-0.8.4-25.el8

SOURCES/0106-multipathd-disallow-changing-to-from-fpin-marginal-p.patch

@@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+Date: Fri, 11 Feb 2022 17:23:39 -0600
+Subject: [PATCH] multipathd: disallow changing to/from fpin marginal paths on
+ reconfig
+
+Setting marginal_pathgroups to fpin causes two new threads to be created
+when multipathd starts.  Turning it on after multipathd starts up won't
+cause the theads to start, and turing it off won't keep the threads from
+working. So disallow changing marginal_pathgroups to/from "fpin" on
+reconfigure.
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ multipath/multipath.conf.5 | 13 ++++++++-----
+ multipathd/main.c          |  9 +++++++++
+ 2 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
+index 805b7a5e..8e418372 100644
+--- a/multipath/multipath.conf.5
++++ b/multipath/multipath.conf.5
+@@ -1077,15 +1077,18 @@ have been tried first. This prevents the possibility of IO errors occuring
+ while marginal paths are still usable. After the path has been monitored
+ for the configured time, and is declared healthy, it will be returned to its
+ normal pathgroup.
+-However if this option is set to \fIfpin\fR multipathd will receive fpin
++If this option is set to \fIfpin\fR, multipathd will receive fpin
+ notifications, set path states to "marginal" accordingly, and regroup paths
+-as described for "marginal_pathgroups yes". This option can't be used in combination
+-with other options for "Shaky path detection" (see below).If it is set to fpin,
+-marginal_path_xyz and san_path_err_xyz parameters are implicitly set to 0.
++as described for \fIon\fR. This option can't be used in combination
++with other options for "Shaky path detection" (see below). \fBNote:\fR If this
++is set to \fIfpin\fR, the \fImarginal_path_*\fR and \fIsan_path_err_*\fR
++options are implicitly set to \fIno\fP. Also, this option cannot be switched
++either to or from \fIfpin\fR on a multipathd reconfigure. multipathd must be
++restarted for the change to take effect.
+ See "Shaky paths detection" below for more information.
+ .RS
+ .TP
+-The default  is: \fBno\fR
++The default is: \fBoff\fR
+ .RE
+ .
+ .
+diff --git a/multipathd/main.c b/multipathd/main.c
+index 4cf5bc41..a6ffbe32 100644
+--- a/multipathd/main.c
++++ b/multipathd/main.c
+@@ -2675,6 +2675,7 @@ int
+ reconfigure (struct vectors * vecs)
+ {
+ 	struct config * old, *conf;
++	int old_marginal_pathgroups;
+ 
+ 	conf = load_config(DEFAULT_CONFIGFILE);
+ 	if (!conf)
+@@ -2702,6 +2703,14 @@ reconfigure (struct vectors * vecs)
+ 	uxsock_timeout = conf->uxsock_timeout;
+ 
+ 	old = rcu_dereference(multipath_conf);
++	old_marginal_pathgroups = old->marginal_pathgroups;
++	if ((old_marginal_pathgroups == MARGINAL_PATHGROUP_FPIN) !=
++	    (conf->marginal_pathgroups == MARGINAL_PATHGROUP_FPIN)) {
++		condlog(1, "multipathd must be restarted to turn %s fpin marginal paths",
++			(old_marginal_pathgroups == MARGINAL_PATHGROUP_FPIN)?
++			"off" : "on");
++		conf->marginal_pathgroups = old_marginal_pathgroups;
++	}
+ 	conf->sequence_nr = old->sequence_nr + 1;
+ 	rcu_assign_pointer(multipath_conf, conf);
+ 	call_rcu(&old->rcu, rcu_free_config);

SPECS/device-mapper-multipath.spec

@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.8.4
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -115,6 +115,8 @@ Patch00101: 0101-libmultipath-check-the-overrides-pctable-for-path-va.patch
 Patch00102: 0102-libmultipath-fix-eh_deadline-documentation.patch
 Patch00103: 0103-libmultipath-Add-documentation-for-the-protocol-subs.patch
 Patch00104: 0104-libmultipath-use-symbolic-value-for-invalid-pcentry.patch
+Patch00105: 0105-multipathd-handle-fpin-events.patch
+Patch00106: 0106-multipathd-disallow-changing-to-from-fpin-marginal-p.patch
 
 # runtime
 Requires: %{name}-libs = %{version}-%{release}
@@ -316,7 +318,12 @@ fi
 %{_pkgconfdir}/libdmmp.pc
 
 %changelog
-* Mon May 16 2022 Benjamin Marzinski <bmarzins@redhat.com> 0.8.4-23
+* Tue May 17 2022 Benjamin Marzinski <bmarzins@redhat.com> 0.8.4-25
+- Add 0105-multipathd-handle-fpin-events.patch
+- Add 0106-multipathd-disallow-changing-to-from-fpin-marginal-p.patch
+- Resolves: bz #2083077
+
+* Mon May 16 2022 Benjamin Marzinski <bmarzins@redhat.com> 0.8.4-24
 - Add 0094-multipath-return-failure-on-an-invalid-remove-comman.patch
   * Fixes bz #2052054
 - Add 0095-libmultipath-steal-the-src-string-pointer-in-merge_s.patch