!215 [sync] PR-212: sync patch multipath-display-the-correct-configuration-when-dum.patch with community

From: @openeuler-sync-bot 
Reviewed-by: @swf504 
Signed-off-by: @swf504

0012-device-mapper-multipath-fix-find-multipath-failure.patch

@@ -7,11 +7,12 @@ when DEFAULT_FIND_MULTIPATHS is FIND_MULTIPATHS_STRICT, it fail to
 find multipath in find_multipaths function, use FIND_MULTIPATHS_OFF
 instead of FIND_MULTIPATHS_STRICT.
 ---
- libmultipath/defaults.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ libmultipath/defaults.h    | 2 +-
+ multipath/multipath.conf.5 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
-index c27946c..e0dd32a 100644
+index a5e9ea0..514fd88 100644
 --- a/libmultipath/defaults.h
 +++ b/libmultipath/defaults.h
 @@ -23,7 +23,7 @@
@@ -23,6 +24,19 @@ index c27946c..e0dd32a 100644
  #define DEFAULT_FAST_IO_FAIL	5
  #define DEFAULT_DEV_LOSS_TMO	600
  #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON
+diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
+index 284282c..94acd44 100644
+--- a/multipath/multipath.conf.5
++++ b/multipath/multipath.conf.5
+@@ -1164,7 +1164,7 @@ as non-multipath and passed on to upper layers.
+ \fBNote:\fR this may cause delays during device detection if
+ there are single-path devices which aren\'t blacklisted.
+ .TP
+-The default is: \fBstrict\fR
++The default is: \fBoff\fR
+ .RE
+ .
+ .
 -- 
-1.8.3.1
+2.27.0
 

0020-multipath.conf.5-fix-documentation-for-find_multipat.patch

@@ -0,0 +1,40 @@
+From 89fa0ba868858482c0e08be6f9f04f36a8a0c020 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwilck@suse.com>
+Date: Sat, 10 Feb 2024 20:38:35 +0100
+Subject: [PATCH] multipath.conf.5: fix documentation for find_multipaths
+
+Document "on" and "off", and mention that "yes"/"1" and "no"/"0" are
+still accepted as alias values.
+
+Suggested-by: Paul Donohue <github@PaulSD.com>
+Signed-off-by: Martin Wilck <mwilck@suse.com>
+---
+ multipath/multipath.conf.5 | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
+index 94acd44..b2d3b3a 100644
+--- a/multipath/multipath.conf.5
++++ b/multipath/multipath.conf.5
+@@ -1139,13 +1139,15 @@ listed in the \fBwwids_file\fR. Users can manually set up multipath maps using t
+ \fBmultipathd add map\fR command. Once set up manually, the map is
+ remembered in the wwids file and will be set up automatically in the future.
+ .TP
+-.I no
++.I off
+ Multipath behaves like \fBstrict\fR. Multipathd behaves like \fBgreedy\fR.
++\fIno\fR or \fI0\fR is accepted as an alias for \fIoff\fR.
+ .TP
+-.I yes
++.I on
+ Both multipathd and multipath treat a device as multipath device if the
+ conditions for \fBstrict\fR are met, or if at least two non-blacklisted paths
+-with the same WWID have been detected.
++with the same WWID have been detected. \fIyes\fR or \fI1\fR is accepted as an
++alias for \fIon\fR.
+ .TP
+ .I greedy
+ Both multipathd and multipath treat every non-blacklisted device as multipath
+-- 
+2.27.0
+

0021-multipath.conf.5-fix-the-description-of-prio_args-fo.patch

@@ -0,0 +1,34 @@
+From 66e536da13199472a3d5293db561adc8677e6793 Mon Sep 17 00:00:00 2001
+From: kouwenqi <kouwenqi@kylinos.cn>
+Date: Tue, 4 Jun 2024 11:07:25 +0800
+Subject: [PATCH] multipath.conf.5: fix the description of prio_args for
+ path_latency prio
+
+This aligns the description of prio_args for path_latency prio and
+the actual code.
+---
+ multipath/multipath.conf.5 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
+index 284282c..d4fd534 100644
+--- a/multipath/multipath.conf.5
++++ b/multipath/multipath.conf.5
+@@ -399,11 +399,11 @@ Needs a value of the form "io_num=\fI<20>\fR base_num=\fI<10>\fR"
+ .TP 8
+ .I io_num
+ The number of read IOs sent to the current path continuously, used to calculate the average path latency.
+-Valid Values: Integer, [2, 200].
++Valid Values: Integer, [20, 200].
+ .TP
+ .I base_num
+-The base number value of logarithmic scale, used to partition different priority ranks. Valid Values: Integer,
+-[2, 10]. And Max average latency value is 100s, min average latency value is 1us.
++The base number value of logarithmic scale, used to partition different priority ranks. Valid Values:
++Double-precision floating-point, [1.1, 10]. And Max average latency value is 100s, min average latency value is 1us.
+ For example: If base_num=10, the paths will be grouped in priority groups with path latency <=1us, (1us, 10us],
+ (10us, 100us], (100us, 1ms], (1ms, 10ms], (10ms, 100ms], (100ms, 1s], (1s, 10s], (10s, 100s], >100s.
+ .RE
+-- 
+2.43.0
+

0022-multipath-display-the-correct-configuration-when-dum.patch

@@ -0,0 +1,44 @@
+From 0802e9dfd27e2333615e8068d7fa55a614bef92e Mon Sep 17 00:00:00 2001
+From: Kou Wenqi <kouwenqi@kylinos.cn>
+Date: Tue, 13 Aug 2024 10:12:36 +0800
+Subject: [PATCH] multipath: display the correct configuration when dumping
+ config
+
+"multipath -t" and "multipath -T" might show the wrong
+multipathd configuration items "retrigger_tries" and
+"force_sync". Make sure they don't.
+
+Signed-off-by: Kou Wenqi <kouwenqi@kylinos.cn>
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+---
+ multipath/main.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/multipath/main.c b/multipath/main.c
+index 90f940f..69acd06 100644
+--- a/multipath/main.c
++++ b/multipath/main.c
+@@ -838,8 +838,6 @@ main (int argc, char *argv[])
+ 	if (atexit(uninit_config))
+ 		condlog(1, "failed to register cleanup handler for config: %m");
+ 	conf = get_multipath_config();
+-	conf->retrigger_tries = 0;
+-	conf->force_sync = 1;
+ 	if (atexit(cleanup_vecs))
+ 		condlog(1, "failed to register cleanup handler for vecs: %m");
+ 	while ((arg = getopt(argc, argv, ":adDcChl::eFfM:v:p:b:BrR:itTquUwW")) != EOF ) {
+@@ -984,6 +982,11 @@ main (int argc, char *argv[])
+ 
+ 	libmp_udev_set_sync_support(1);
+ 
++	if (cmd != CMD_DUMP_CONFIG) {
++		conf->retrigger_tries = 0;
++		conf->force_sync = 1;
++	}
++
+ 	if ((cmd == CMD_LIST_SHORT || cmd == CMD_LIST_LONG) && enable_foreign)
+ 		conf->enable_foreign = strdup("");
+ 
+-- 
+2.27.0
+

multipath-tools.spec

@@ -1,7 +1,7 @@
 #needsrootforbuild
 Name:    multipath-tools
 Version: 0.9.5
-Release: 2
+Release: 7
 Summary: Tools to manage multipath devices with the device-mapper
 License: GPL-2.0-or-later and LGPL-2.0-only
 URL:     http://christophe.varoqui.free.fr/
@@ -28,6 +28,9 @@ Patch16: 0016-multipathd-Fixed-multipathd-parameter-invoking-seque.patch
 Patch17: 0017-libmultipath-io_err_stat-don-t-free-aio-memory-befor.patch
 Patch18: 0018-libmultipath-io_err_stat-call-io_destroy-inside-free.patch
 Patch19: 0019-libmultipath-sysfs_set_scsi_tmo-do-nothing-for-ACT_D.patch
+Patch20: 0020-multipath.conf.5-fix-documentation-for-find_multipat.patch
+Patch21: 0021-multipath.conf.5-fix-the-description-of-prio_args-fo.patch
+Patch22: 0022-multipath-display-the-correct-configuration-when-dum.patch
 
 BuildRequires:    multipath-tools, libcmocka, libcmocka-devel
 BuildRequires:    gcc, libaio-devel, userspace-rcu-devel, device-mapper-devel >= 1.02.89
@@ -73,6 +76,7 @@ that are %{name}'s libbmpathpersist and libmpathcmd libraries.
 %package help
 Summary:   Including man files for multipath-tools.
 Requires:  man
+Buildarch: noarch
 Provides:  device-mapper-multipath-help
 Obsoletes: device-mapper-multipath-help
 %description    help
@@ -181,6 +185,21 @@ fi
 
 
 %changelog
+* Tue Aug 27 2024 kouwenqi <kouwenqi@kylinos.cn> - 0.9.5-7
+- sync patch22 with community
+
+* Tue Aug 20 2024 Jiaming Zhang <zhangjiaming@cqsoftware.com.cn> - 0.9.5-6
+- Added 'Buildarch:noarch' to the help subpackage
+
+* Fri Aug 2 2024 kouwenqi <kouwenqi@kylinos.cn> - 0.9.5-5
+- multipath: display the correct configuration when dumpping config
+
+* Fri Jul 12 2024 kouwenqi <kouwenqi@kylinos.cn> - 0.9.5-4
+- multipath.conf.5: fix the description of prio_args for path_latency prio
+
+* Tue Jul 2 2024 kouwenqi <kouwenqi@kylinos.cn> - 0.9.5-3
+- multipath.conf.5: fix documentation for find_multipaths
+
 * Mon May 27 2024 kouwenqi <kouwenqi@kylinos.cn> - 0.9.5-2
 - libmultipath: sysfs_set_scsi_tmo: do nothing for ACT_DRY_RUN