File 0001-Mid-execd-Skips-merging-of-canceled-fencin... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Mid-execd-Skips-merging-of-canceled-fencing-monitors.patch of Package pacemaker (Revision a13156ac53f00c00f9f3b1dbc591459e)

Currently displaying revision a13156ac53f00c00f9f3b1dbc591459e , Show latest

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)

---
 daemons/execd/execd_commands.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/daemons/execd/execd_commands.c b/daemons/execd/execd_commands.c
index 25b6007fa..211e74118 100644
--- a/daemons/execd/execd_commands.c
+++ b/daemons/execd/execd_commands.c
@@ -411,6 +411,12 @@ merge_recurring_duplicate(lrmd_rsc_t * rsc, lrmd_cmd_t * cmd)
         dup = gIter->data;
         if (pcmk__str_eq(cmd->action, dup->action, pcmk__str_casei)
             && (cmd->interval_ms == dup->interval_ms)) {
+            if (pcmk__str_eq(rsc->class, PCMK_RESOURCE_CLASS_STONITH, pcmk__str_casei)) {
+                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;
         }
     }
-- 
2.26.2

Places

File 0001-Mid-execd-Skips-merging-of-canceled-fencing-monitors.patch of Package pacemaker (Revision a13156ac53f00c00f9f3b1dbc591459e)

Places