From ce5b96a800c23ddedb710ae2d385618fac8812a4 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Thu, 28 Oct 2021 19:53:00 -0500 Subject: [PATCH] device-mapper-multipath-0.8.7-3 Update to the head of the upstream staging branch * Patches 0011 & 0012 are from the upstream staging branch Rename redhat patches * Previous patches 0011-0020 are now patches 0013-0022 --- ...-tools-make-EMC-Invista-config-work-.patch | 35 +++++++++++++++++ ...-tools-make-EMC-SYMMETRIX-config-wor.patch | 38 +++++++++++++++++++ ... 0013-RH-fixup-udev-rules-for-redhat.patch | 0 ...property-blacklist-exception-builtin.patch | 0 ...RH-don-t-start-without-a-config-file.patch | 0 ...H-Fix-nvme-function-missing-argument.patch | 0 ... 0017-RH-use-rpm-optflags-if-present.patch | 0 ...hconf.patch => 0018-RH-add-mpathconf.patch | 0 ...om-kernel-cmdline-mpath.wwids-with-A.patch | 0 ...-default-find_mutipaths-value-to-off.patch | 0 ...empt-to-get-ANA-info-via-sysfs-first.patch | 0 ...-parse_vpd_pg83-match-scsi_id-output.patch | 0 device-mapper-multipath.spec | 30 +++++++++------ 13 files changed, 92 insertions(+), 11 deletions(-) create mode 100644 0011-Revert-multipath-tools-make-EMC-Invista-config-work-.patch create mode 100644 0012-Revert-multipath-tools-make-EMC-SYMMETRIX-config-wor.patch rename 0011-RH-fixup-udev-rules-for-redhat.patch => 0013-RH-fixup-udev-rules-for-redhat.patch (100%) rename 0012-RH-Remove-the-property-blacklist-exception-builtin.patch => 0014-RH-Remove-the-property-blacklist-exception-builtin.patch (100%) rename 0013-RH-don-t-start-without-a-config-file.patch => 0015-RH-don-t-start-without-a-config-file.patch (100%) rename 0014-RH-Fix-nvme-function-missing-argument.patch => 0016-RH-Fix-nvme-function-missing-argument.patch (100%) rename 0015-RH-use-rpm-optflags-if-present.patch => 0017-RH-use-rpm-optflags-if-present.patch (100%) rename 0016-RH-add-mpathconf.patch => 0018-RH-add-mpathconf.patch (100%) rename 0017-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch => 0019-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch (100%) rename 0018-RH-reset-default-find_mutipaths-value-to-off.patch => 0020-RH-reset-default-find_mutipaths-value-to-off.patch (100%) rename 0019-RH-attempt-to-get-ANA-info-via-sysfs-first.patch => 0021-RH-attempt-to-get-ANA-info-via-sysfs-first.patch (100%) rename 0020-RH-make-parse_vpd_pg83-match-scsi_id-output.patch => 0022-RH-make-parse_vpd_pg83-match-scsi_id-output.patch (100%) diff --git a/0011-Revert-multipath-tools-make-EMC-Invista-config-work-.patch b/0011-Revert-multipath-tools-make-EMC-Invista-config-work-.patch new file mode 100644 index 0000000..1912f80 --- /dev/null +++ b/0011-Revert-multipath-tools-make-EMC-Invista-config-work-.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martin Wilck +Date: Wed, 20 Oct 2021 20:44:54 +0200 +Subject: [PATCH] Revert "multipath-tools: make EMC/Invista config work with + alua and multibus" + +This reverts commit 309ff281aaa07e862540d3d645a8263f3e9baaed. + +Mail from , 20210930: + +"OPM is no longer supported in the Dell VPLEX product. If we at Dell had +wished to change the default device stanzas for any of our products they +would have been done when the product and/or feature is released. +Please remove this patch as well. It is not needed." + +Signed-off-by: Benjamin Marzinski +--- + libmultipath/hwtable.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c +index 763982cd..211087ad 100644 +--- a/libmultipath/hwtable.c ++++ b/libmultipath/hwtable.c +@@ -350,9 +350,8 @@ static struct hwentry default_hw[] = { + .vendor = "EMC", + .product = "Invista", + .bl_product = "LUNZ", +- .pgpolicy = GROUP_BY_PRIO, ++ .pgpolicy = MULTIBUS, + .no_path_retry = 5, +- .pgfailback = -FAILBACK_IMMEDIATE, + }, + { + /* XtremIO */ diff --git a/0012-Revert-multipath-tools-make-EMC-SYMMETRIX-config-wor.patch b/0012-Revert-multipath-tools-make-EMC-SYMMETRIX-config-wor.patch new file mode 100644 index 0000000..b889ea8 --- /dev/null +++ b/0012-Revert-multipath-tools-make-EMC-SYMMETRIX-config-wor.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martin Wilck +Date: Wed, 20 Oct 2021 20:46:09 +0200 +Subject: [PATCH] Revert "multipath-tools: make EMC/SYMMETRIX config work with + alua and multibus" + +This reverts commit 831af0dbfa171cd39d968ba6174669f11a278be9. + +Mail from "berthiaume, wayne" , 210930: + +"As a representative of Dell I request this patch be withdrawn. If we had +wanted the default stanza changed we would have already implemented it. +Also for your information we only advertise the entire enterprise storage +product line (DMX, VMAX, VMAX AFA, PowerMax) as SYMMETRIX in the VPD page. +The ALUA capability is only used for mobility devices in an SRDF/Metro +configuration and the current device stanza still works well in all of our +testing." + +Signed-off-by: Benjamin Marzinski +--- + libmultipath/hwtable.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c +index 211087ad..a8ba28e3 100644 +--- a/libmultipath/hwtable.c ++++ b/libmultipath/hwtable.c +@@ -329,9 +329,8 @@ static struct hwentry default_hw[] = { + /* Symmetrix / DMX / VMAX / PowerMax */ + .vendor = "EMC", + .product = "SYMMETRIX", +- .pgpolicy = GROUP_BY_PRIO, ++ .pgpolicy = MULTIBUS, + .no_path_retry = 6, +- .pgfailback = -FAILBACK_IMMEDIATE, + }, + { + /* DGC CLARiiON CX/AX / VNX and Unity */ diff --git a/0011-RH-fixup-udev-rules-for-redhat.patch b/0013-RH-fixup-udev-rules-for-redhat.patch similarity index 100% rename from 0011-RH-fixup-udev-rules-for-redhat.patch rename to 0013-RH-fixup-udev-rules-for-redhat.patch diff --git a/0012-RH-Remove-the-property-blacklist-exception-builtin.patch b/0014-RH-Remove-the-property-blacklist-exception-builtin.patch similarity index 100% rename from 0012-RH-Remove-the-property-blacklist-exception-builtin.patch rename to 0014-RH-Remove-the-property-blacklist-exception-builtin.patch diff --git a/0013-RH-don-t-start-without-a-config-file.patch b/0015-RH-don-t-start-without-a-config-file.patch similarity index 100% rename from 0013-RH-don-t-start-without-a-config-file.patch rename to 0015-RH-don-t-start-without-a-config-file.patch diff --git a/0014-RH-Fix-nvme-function-missing-argument.patch b/0016-RH-Fix-nvme-function-missing-argument.patch similarity index 100% rename from 0014-RH-Fix-nvme-function-missing-argument.patch rename to 0016-RH-Fix-nvme-function-missing-argument.patch diff --git a/0015-RH-use-rpm-optflags-if-present.patch b/0017-RH-use-rpm-optflags-if-present.patch similarity index 100% rename from 0015-RH-use-rpm-optflags-if-present.patch rename to 0017-RH-use-rpm-optflags-if-present.patch diff --git a/0016-RH-add-mpathconf.patch b/0018-RH-add-mpathconf.patch similarity index 100% rename from 0016-RH-add-mpathconf.patch rename to 0018-RH-add-mpathconf.patch diff --git a/0017-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/0019-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch similarity index 100% rename from 0017-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch rename to 0019-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch diff --git a/0018-RH-reset-default-find_mutipaths-value-to-off.patch b/0020-RH-reset-default-find_mutipaths-value-to-off.patch similarity index 100% rename from 0018-RH-reset-default-find_mutipaths-value-to-off.patch rename to 0020-RH-reset-default-find_mutipaths-value-to-off.patch diff --git a/0019-RH-attempt-to-get-ANA-info-via-sysfs-first.patch b/0021-RH-attempt-to-get-ANA-info-via-sysfs-first.patch similarity index 100% rename from 0019-RH-attempt-to-get-ANA-info-via-sysfs-first.patch rename to 0021-RH-attempt-to-get-ANA-info-via-sysfs-first.patch diff --git a/0020-RH-make-parse_vpd_pg83-match-scsi_id-output.patch b/0022-RH-make-parse_vpd_pg83-match-scsi_id-output.patch similarity index 100% rename from 0020-RH-make-parse_vpd_pg83-match-scsi_id-output.patch rename to 0022-RH-make-parse_vpd_pg83-match-scsi_id-output.patch diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec index 242f450..3a0813a 100644 --- a/device-mapper-multipath.spec +++ b/device-mapper-multipath.spec @@ -1,6 +1,6 @@ Name: device-mapper-multipath Version: 0.8.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools to manage multipath devices using device-mapper License: GPLv2 URL: http://christophe.varoqui.free.fr/ @@ -20,16 +20,18 @@ Patch0007: 0007-multipath-tools-make-EMC-SYMMETRIX-config-work-with-.patch Patch0008: 0008-multipath-tools-make-EMC-Invista-config-work-with-al.patch Patch0009: 0009-multipath-tools-make-COMPELNT-Compellent-Vol-config-.patch Patch0010: 0010-multipath-tools-remove-Compellent-maintainer.patch -Patch0011: 0011-RH-fixup-udev-rules-for-redhat.patch -Patch0012: 0012-RH-Remove-the-property-blacklist-exception-builtin.patch -Patch0013: 0013-RH-don-t-start-without-a-config-file.patch -Patch0014: 0014-RH-Fix-nvme-function-missing-argument.patch -Patch0015: 0015-RH-use-rpm-optflags-if-present.patch -Patch0016: 0016-RH-add-mpathconf.patch -Patch0017: 0017-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch -Patch0018: 0018-RH-reset-default-find_mutipaths-value-to-off.patch -Patch0019: 0019-RH-attempt-to-get-ANA-info-via-sysfs-first.patch -Patch0020: 0020-RH-make-parse_vpd_pg83-match-scsi_id-output.patch +Patch0011: 0011-Revert-multipath-tools-make-EMC-Invista-config-work-.patch +Patch0012: 0012-Revert-multipath-tools-make-EMC-SYMMETRIX-config-wor.patch +Patch0013: 0013-RH-fixup-udev-rules-for-redhat.patch +Patch0014: 0014-RH-Remove-the-property-blacklist-exception-builtin.patch +Patch0015: 0015-RH-don-t-start-without-a-config-file.patch +Patch0016: 0016-RH-Fix-nvme-function-missing-argument.patch +Patch0017: 0017-RH-use-rpm-optflags-if-present.patch +Patch0018: 0018-RH-add-mpathconf.patch +Patch0019: 0019-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +Patch0020: 0020-RH-reset-default-find_mutipaths-value-to-off.patch +Patch0021: 0021-RH-attempt-to-get-ANA-info-via-sysfs-first.patch +Patch0022: 0022-RH-make-parse_vpd_pg83-match-scsi_id-output.patch # runtime Requires: %{name}-libs = %{version}-%{release} @@ -227,6 +229,12 @@ fi %{_pkgconfdir}/libdmmp.pc %changelog +* Thu Oct 28 2021 Benjamin Marzinski - 0.8.7-3 +- Update to the head of the upstream staging branch + * Patches 0011 & 0012 are from the upstream staging branch +- Rename redhat patches + * Previous patches 0011-0020 are now patches 0013-0022 + * Wed Oct 6 2021 Benjamin Marzinski - 0.8.7-2 - Modify 0013-RH-don-t-start-without-a-config-file.patch * add condtion to multipathd.socket as well