rpms/device-mapper-multipath
5
0
Fork 0
Code Issues Pull Requests Releases Activity

device-mapper-multipath-0.8.7-34

Browse Source 
Add 0123-multipathd-checker-port_state-before-setting-it.patch
Resolves: RHEL-59157
This commit is contained in:
Benjamin Marzinski 2024-09-17 15:46:08 -04:00
parent 09b1d6a12a
commit 8e57b9428e
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0123-multipathd-checker-port_state-before-setting-it.patch Normal file
View File

@ -0,0 +1,40 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Benjamin Marzinski <bmarzins@redhat.com>
Date: Mon, 16 Sep 2024 19:29:13 -0400
Subject: [PATCH] multipathd: checker port_state before setting it.
If the rport port_state is already Marginal, trying to set it to
Marginal causes an error like the following:
multipathd[365376]: /sys/devices/pci0000:c0/0000:c0:01.1/0000:c4:00.0/host0/rport-0:0-5/fc_remote_ports/rport-0:0-5: failed to set port_state to marginal: Invalid argument
To avoid causing this confusing error message, check if the port_state
is already marginal before trying to set it.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
---
multipathd/fpin_handlers.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/multipathd/fpin_handlers.c b/multipathd/fpin_handlers.c
index d5f7594d..c5b9785f 100644
--- a/multipathd/fpin_handlers.c
+++ b/multipathd/fpin_handlers.c
@@ -168,8 +168,16 @@ fpin_els_add_li_frame(struct fc_nl_event *fc_event)
/*Sets the rport port_state to marginal*/
static void fpin_set_rport_marginal(struct udev_device *rport_dev)
{
+ char old_value[20]; /* match kernel show_fc_rport_port_state() size */
+ static const char marginal[] = "Marginal";
+ ssize_t ret;
+
+ ret = sysfs_attr_get_value(rport_dev, "port_state",
+ old_value, sizeof(old_value));
+ if (ret == sizeof(marginal) - 1 && strcmp(old_value, marginal) == 0)
+ return;
sysfs_attr_set_value(rport_dev, "port_state",
- "Marginal", strlen("Marginal"));
+ marginal, sizeof(marginal) - 1);
}
/*Add the marginal devices info into the list and return 0 on success*/

7
device-mapper-multipath.spec
View File

@ -1,6 +1,6 @@
Name: device-mapper-multipath
Version: 0.8.7
Release: 33%{?dist}
Release: 34%{?dist}
Summary: Tools to manage multipath devices using device-mapper
License: GPLv2
URL: http://christophe.varoqui.free.fr/
@ -132,6 +132,7 @@ Patch0119: 0119-multipath-tools-man-pages-Add-format-wildcard-descri.patch
Patch0120: 0120-multipath-tools-fix-multipath-ll-bug-for-Native-NVME.patch
Patch0121: 0121-multipathd-set-reply-length-to-zero-for-NULL-replies.patch
Patch0122: 0122-libmultipath-fix-ontap-prioritizer-snprintf-limits.patch
Patch0123: 0123-multipathd-checker-port_state-before-setting-it.patch
# runtime
@ -335,6 +336,10 @@ fi
%{_pkgconfdir}/libdmmp.pc
%changelog
* Tue Sep 17 2024 Benjamin Marzinski <bmarzins@redhat.com> - 0.8.7-34
- Add 0123-multipathd-checker-port_state-before-setting-it.patch
- Resolves: RHEL-59157
* Fri Sep 13 2024 Benjamin Marzinski <bmarzins@redhat.com> - 0.8.7-33
- Add 0122-libmultipath-fix-ontap-prioritizer-snprintf-limits.patch
- Resolves: RHEL-58920