File bsc#1210074-0008-Log-controller-log-fencing-timeout-consistently-in-s.patch of Package pacemaker.34782
From 469b203462dcc0dea38646c3fd49577fd9b310b7 Mon Sep 17 00:00:00 2001
From: "Gao,Yan" <ygao@suse.com>
Date: Mon, 17 Apr 2023 12:11:06 +0200
Subject: [PATCH 08/11] Log: controller: log fencing timeout consistently in
seconds as priority fencing delay
---
daemons/controld/controld_fencing.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Index: pacemaker-2.1.5+20221208.a3f44794f/daemons/controld/controld_fencing.c
===================================================================
--- pacemaker-2.1.5+20221208.a3f44794f.orig/daemons/controld/controld_fencing.c
+++ pacemaker-2.1.5+20221208.a3f44794f/daemons/controld/controld_fencing.c
@@ -916,7 +916,8 @@ controld_execute_fence_action(pcmk__grap
const char *priority_delay = NULL;
int delay_i = 0;
gboolean invalid_action = FALSE;
- guint stonith_timeout = transition_graph->stonith_timeout;
+ int stonith_timeout = (int) (transition_graph->stonith_timeout
+ / 1000);
id = ID(action->xml);
target = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
@@ -936,7 +937,7 @@ controld_execute_fence_action(pcmk__grap
priority_delay = crm_meta_value(action->params, XML_CONFIG_ATTR_PRIORITY_FENCING_DELAY);
crm_notice("Requesting fencing (%s) of node %s "
- CRM_XS " action=%s timeout=%u%s%s",
+ CRM_XS " action=%s timeout=%i%s%s",
type, target, id, stonith_timeout,
priority_delay ? " priority_delay=" : "",
priority_delay ? priority_delay : "");
@@ -949,7 +950,7 @@ controld_execute_fence_action(pcmk__grap
action->id, 0,
te_uuid),
stonith_api->cmds->register_callback(stonith_api, rc,
- ((int) (stonith_timeout / 1000)
+ (stonith_timeout
+ (delay_i > 0 ? delay_i : 0)),
st_opt_timeout_updates, transition_key,
"tengine_stonith_callback",