Add 0035-libmpathpersist-fix-memory-leak-in-mpath_prout_rel.patch Add 0036-libmpathpersist-retry-commands-on-other-paths-in-mpa.patch Add 0037-libmpathpersist-check-released-key-against-the-reser.patch Add 0038-multipathd-remove-thread-from-mpath_pr_event_handle.patch Add 0039-libmpathpersist-remove-uneeded-wrapper-function.patch Add 0040-libmpathpersist-reduce-log-level-for-persistent-rese.patch Add 0041-libmpathpersist-remove-pointless-update_map_pr-ret-v.patch Add 0042-multipathd-use-update_map_pr-in-mpath_pr_event_handl.patch Add 0043-libmpathpersist-limit-changing-prflag-in-update_map_.patch Add 0044-multipathd-Don-t-call-update_map_pr-unnecessarily.patch Add 0045-libmpathpersist-remove-useless-function-send_prout_a.patch Add 0046-libmpathpersist-redesign-failed-release-workaround.patch Add 0047-libmpathpersist-fail-the-release-if-all-threads-fail.patch Add 0048-libmpathpersist-Handle-changing-key-corner-case.patch Add 0049-libmpathpersist-Handle-REGISTER-AND-IGNORE-changing-.patch Add 0050-libmultipath-rename-prflag_value-enums.patch Add 0051-libmpathpersist-use-a-switch-statement-for-prout-com.patch Add 0052-libmpathpersist-Add-safety-check-for-preempting-on-k.patch Add 0053-libmpathpersist-remove-update_map_pr-code-for-NULL-p.patch Add 0054-libmpathpersist-move-update_map_pr-to-multipathd.patch Add 0055-multipathd-clean-up-update_map_pr-and-mpath_pr_event.patch Add 0056-libmpathpersist-clean-up-duplicate-function-declarat.patch Add 0057-multipathd-wrap-setting-and-unsetting-prflag.patch Add 0058-multipathd-unregister-PR-key-when-path-is-restored-i.patch Add 0059-libmpathpersist-Fix-up-reservation_key-checking.patch Add 0060-libmpathpersist-change-how-reservation-conflicts-are.patch Add 0061-libmpathpersist-Clear-prkey-in-multipathd-before-unr.patch Add 0062-libmpathpersist-only-clear-the-key-if-we-are-using-t.patch Add 0063-libmpathpersist-Restore-old-reservation-key-on-failu.patch Add 0064-libmpathpersist-update-reservation-key-before-checki.patch Add 0065-libmpathpersist-retry-on-conflicts-in-mpath_prout_co.patch Add 0066-libmpathpersist-Don-t-always-fail-registrations-for-.patch Add 0067-libmpathpersist-Don-t-try-release-workaround-for-inv.patch Add 0068-libmpathpersist-Don-t-fail-RESERVE-commands-unnecess.patch Add 0069-libmpathpersist-reregister-keys-when-self-preempting.patch Add 0070-libmpathpersist-handle-updating-key-race-condition.patch Add 0071-libmpathpersist-handle-preempting-all-registrants-re.patch Add 0072-libmpathpersist-Fix-REGISTER-AND-IGNORE-while-holdin.patch Add 0073-libmpathpersist-Handle-RESERVE-with-reservation-held.patch Add 0074-libmpathpersist-use-check_holding_reservation-in-mpa.patch Add 0075-libmpathpersist-Fix-unregistering-while-holding-the-.patch Add 0076-libmpathpersist-Fix-race-between-restoring-a-path-an.patch Add 0077-multipathd-Fix-tracking-of-old-PR-key.patch * Fixes RHEL-118720 ("There are many bugs in multipath's persistent reservation handling [rhel-10]") Resolves: RHEL-118720
103 lines
3.6 KiB
Diff
103 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Thu, 10 Jul 2025 14:10:48 -0400
|
|
Subject: [PATCH] libmpathpersist: reduce log level for persistent reservation
|
|
checking
|
|
|
|
Move logging of minor expected behavior to INFO level. Modify the log
|
|
level of some messages by whether or not mpp->prflag changed values.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
libmpathpersist/mpath_persist_int.c | 34 +++++++++++++++++++----------
|
|
1 file changed, 22 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/libmpathpersist/mpath_persist_int.c b/libmpathpersist/mpath_persist_int.c
|
|
index fb1d0081..6233e6b0 100644
|
|
--- a/libmpathpersist/mpath_persist_int.c
|
|
+++ b/libmpathpersist/mpath_persist_int.c
|
|
@@ -60,7 +60,7 @@ static int mpath_prin_activepath (struct multipath *mpp, int rq_servact,
|
|
vector_foreach_slot (pgp->paths, pp, i){
|
|
if (!((pp->state == PATH_UP) ||
|
|
(pp->state == PATH_GHOST))){
|
|
- condlog(2, "%s: %s not available. Skip.",
|
|
+ condlog(3, "%s: %s not available. Skip.",
|
|
mpp->wwid, pp->dev);
|
|
condlog(3, "%s: status = %d.",
|
|
mpp->wwid, pp->state);
|
|
@@ -733,12 +733,14 @@ int update_map_pr(struct multipath *mpp)
|
|
struct prin_resp *resp;
|
|
unsigned int i;
|
|
int ret = MPATH_PR_OTHER, isFound;
|
|
+ bool was_set = (mpp->prflag == PRFLAG_SET);
|
|
|
|
if (!get_be64(mpp->reservation_key))
|
|
{
|
|
/* Nothing to do. Assuming pr mgmt feature is disabled*/
|
|
mpp->prflag = PRFLAG_UNSET;
|
|
- condlog(4, "%s: reservation_key not set in multipath.conf",
|
|
+ condlog(was_set ? 2 : 4,
|
|
+ "%s: reservation_key not set in multipath.conf",
|
|
mpp->alias);
|
|
return MPATH_PR_SUCCESS;
|
|
}
|
|
@@ -751,8 +753,7 @@ int update_map_pr(struct multipath *mpp)
|
|
}
|
|
if (count_active_paths(mpp) == 0)
|
|
{
|
|
- condlog(0,"%s: No available paths to check pr status",
|
|
- mpp->alias);
|
|
+ condlog(2, "%s: No available paths to check pr status", mpp->alias);
|
|
goto out;
|
|
}
|
|
mpp->prflag = PRFLAG_UNSET;
|
|
@@ -768,22 +769,31 @@ int update_map_pr(struct multipath *mpp)
|
|
|
|
if (resp->prin_descriptor.prin_readkeys.additional_length == 0 )
|
|
{
|
|
- condlog(3,"%s: No key found. Device may not be registered. ", mpp->alias);
|
|
+ condlog(was_set ? 1 : 3,
|
|
+ "%s: No key found. Device may not be registered. ",
|
|
+ mpp->alias);
|
|
goto out;
|
|
}
|
|
|
|
- condlog(2, "%s: Multipath reservation_key: 0x%" PRIx64 " ", mpp->alias,
|
|
+ condlog(3, "%s: Multipath reservation_key: 0x%" PRIx64 " ", mpp->alias,
|
|
get_be64(mpp->reservation_key));
|
|
|
|
isFound =0;
|
|
for (i = 0; i < resp->prin_descriptor.prin_readkeys.additional_length/8; i++ )
|
|
{
|
|
- condlog(2, "%s: PR IN READKEYS[%d] reservation key:", mpp->alias, i);
|
|
- dumpHex((char *)&resp->prin_descriptor.prin_readkeys.key_list[i*8], 8 , 1);
|
|
+ if (libmp_verbosity >= 3) {
|
|
+ condlog(3, "%s: PR IN READKEYS[%d] reservation key:",
|
|
+ mpp->alias, i);
|
|
+ dumpHex((char *)&resp->prin_descriptor.prin_readkeys
|
|
+ .key_list[i * 8],
|
|
+ 8, 1);
|
|
+ }
|
|
|
|
- if (!memcmp(&mpp->reservation_key, &resp->prin_descriptor.prin_readkeys.key_list[i*8], 8))
|
|
- {
|
|
- condlog(2, "%s: reservation key found in pr in readkeys response", mpp->alias);
|
|
+ if (!memcmp(&mpp->reservation_key,
|
|
+ &resp->prin_descriptor.prin_readkeys.key_list[i * 8],
|
|
+ 8)) {
|
|
+ condlog(3, "%s: reservation key found in pr in readkeys response",
|
|
+ mpp->alias);
|
|
isFound =1;
|
|
}
|
|
}
|
|
@@ -791,7 +801,7 @@ int update_map_pr(struct multipath *mpp)
|
|
if (isFound)
|
|
{
|
|
mpp->prflag = PRFLAG_SET;
|
|
- condlog(2, "%s: prflag flag set.", mpp->alias );
|
|
+ condlog(was_set ? 3 : 2, "%s: prflag flag set.", mpp->alias);
|
|
}
|
|
|
|
out:
|