From cd6e35ac6bda07d60a04b21cd7092096d17a3138 Mon Sep 17 00:00:00 2001 From: Kou Wenqi Date: Tue, 2 Jul 2024 10:20:50 +0800 Subject: [PATCH] multipath.conf.5: fix documentation for find_multipaths (cherry picked from commit 2f9528dec5e8ecedc0be894597a6f65b6f4d5376) --- ...multipath-fix-find-multipath-failure.patch | 22 ++++++++-- ...-fix-documentation-for-find_multipat.patch | 40 +++++++++++++++++++ multipath-tools.spec | 6 ++- 3 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 0020-multipath.conf.5-fix-documentation-for-find_multipat.patch diff --git a/0012-device-mapper-multipath-fix-find-multipath-failure.patch b/0012-device-mapper-multipath-fix-find-multipath-failure.patch index 784b22b..2bc20e3 100644 --- a/0012-device-mapper-multipath-fix-find-multipath-failure.patch +++ b/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 diff --git a/0020-multipath.conf.5-fix-documentation-for-find_multipat.patch b/0020-multipath.conf.5-fix-documentation-for-find_multipat.patch new file mode 100644 index 0000000..5cb261c --- /dev/null +++ b/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 +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 +Signed-off-by: Martin Wilck +--- + 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 + diff --git a/multipath-tools.spec b/multipath-tools.spec index 8479baf..d484c16 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ #needsrootforbuild Name: multipath-tools Version: 0.9.5 -Release: 2 +Release: 3 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,7 @@ 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 BuildRequires: multipath-tools, libcmocka, libcmocka-devel BuildRequires: gcc, libaio-devel, userspace-rcu-devel, device-mapper-devel >= 1.02.89 @@ -181,6 +182,9 @@ fi %changelog +* Tue Jul 2 2024 kouwenqi - 0.9.5-3 +- multipath.conf.5: fix documentation for find_multipaths + * Mon May 27 2024 kouwenqi - 0.9.5-2 - libmultipath: sysfs_set_scsi_tmo: do nothing for ACT_DRY_RUN -- Gitee