File 0001-Mid-execd-Skips-merging-of-canceled-fencing-monitors.patch of Package pacemaker.26413
From 41675e135420448149a5e4a9e69d70300c18de6c Mon Sep 17 00:00:00 2001
From: Hideo Yamauchi <renayama19661014@ybb.ne.jp>
Date: Fri, 5 Feb 2021 09:16:01 +0900
Subject: [PATCH] Mid: execd: Skips merging of canceled fencing
monitors.(Fix:#CLBZ5393)
---
lrmd/lrmd.c | 6 ++++++
1 file changed, 6 insertions(+)
Index: pacemaker-1.1.18+20180430.b12c320f5/lrmd/lrmd.c
===================================================================
--- pacemaker-1.1.18+20180430.b12c320f5.orig/lrmd/lrmd.c
+++ pacemaker-1.1.18+20180430.b12c320f5/lrmd/lrmd.c
@@ -275,6 +275,12 @@ merge_recurring_duplicate(lrmd_rsc_t * r
dup = gIter->data;
if (safe_str_eq(cmd->action, dup->action)
&& (cmd->interval_ms == dup->interval_ms)) {
+ if (safe_str_eq(rsc->class, PCMK_RESOURCE_CLASS_STONITH)) {
+ if (dup->lrmd_op_status == PCMK_LRM_OP_CANCELLED) {
+ /* Fencing monitors marked for cancellation will not be merged to respond to cancellation. */
+ return FALSE;
+ }
+ }
goto merge_dup;
}
}