From 8c35d22f8b1d7408a263aaa8b570e0febcfe8258 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Wed, 9 Oct 2024 15:30:52 +0200 Subject: [PATCH] - fence_mpath: add support for hex-key format (used in multipath.conf) Resolves: RHEL-56138 - fence_scsi/fence_mpath: add support for SPC-4 disks Resolves: RHEL-76298 --- RHEL-56138-fence_mpath-support-hex-key-format.patch | 10 ++++++++++ fence-agents.spec | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 RHEL-56138-fence_mpath-support-hex-key-format.patch diff --git a/RHEL-56138-fence_mpath-support-hex-key-format.patch b/RHEL-56138-fence_mpath-support-hex-key-format.patch new file mode 100644 index 0000000..0b2cd5a --- /dev/null +++ b/RHEL-56138-fence_mpath-support-hex-key-format.patch @@ -0,0 +1,10 @@ +--- a/agents/mpath/fence_mpath.py 2024-10-09 14:56:07.688665678 +0200 ++++ b/agents/mpath/fence_mpath.py 2024-10-09 14:56:12.639780798 +0200 +@@ -323,6 +323,7 @@ + fail_usage("Failed: No devices found") + + options["devices"] = [d for d in re.split("\s*,\s*|\s+", options["--devices"].strip()) if d] ++ options["--plug"] = re.sub(r"^0x0*|^0+", "", options["--plug"]) + # Input control END + + result = fence_action(None, options, set_status, get_status) diff --git a/fence-agents.spec b/fence-agents.spec index 6009ce0..ff2b644 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -57,7 +57,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.10.0 -Release: 77%{?alphatag:.%{alphatag}}%{?dist} +Release: 78%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/fence-agents Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz @@ -242,6 +242,7 @@ Patch55: RHEL-25256-fence_vmware_rest-detect-user-sufficient-rights.patch Patch56: RHEL-43235-fence_aws-1-list-add-instance-name-status.patch Patch57: RHEL-43235-fence_aws-2-log-error-for-unknown-states.patch Patch58: RHEL-59878-fence_scsi-only-preempt-once-for-mpath-devices.patch +Patch59: RHEL-56138-fence_mpath-support-hex-key-format.patch ### HA support libs/utils ### # all archs @@ -422,6 +423,7 @@ BuildRequires: %{systemd_units} %patch -p1 -P 56 %patch -p1 -P 57 %patch -p1 -P 58 +%patch -p1 -P 59 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1505,6 +1507,12 @@ are located on corosync cluster nodes. %endif %changelog +* Wed Oct 9 2024 Oyvind Albrigtsen - 4.10.0-78 +- fence_mpath: add support for hex-key format (used in multipath.conf) + Resolves: RHEL-56138 +- fence_scsi/fence_mpath: add support for SPC-4 disks + Resolves: RHEL-76298 + * Wed Sep 25 2024 Oyvind Albrigtsen - 4.10.0-77 - fence_scsi: preempt clears all devices on the mpath device, so only run it for the first device