File bsc#1210074-0008-Log-controller-log-fencing-tim... of Package pacemaker.29826

Overview Repositories Revisions Requests Users Attributes Meta

File bsc#1210074-0008-Log-controller-log-fencing-timeout-consistently-in-s.patch of Package pacemaker.29826

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.0.4+20200616.2deceaa3a/daemons/controld/controld_fencing.c
===================================================================
--- pacemaker-2.0.4+20200616.2deceaa3a.orig/daemons/controld/controld_fencing.c
+++ pacemaker-2.0.4+20200616.2deceaa3a/daemons/controld/controld_fencing.c
@@ -817,7 +817,8 @@ te_fence_node(crm_graph_t *graph, crm_ac
     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);
     enum stonith_call_options options = st_opt_none;
 
     id = ID(action->xml);
@@ -838,7 +839,7 @@ te_fence_node(crm_graph_t *graph, crm_ac
     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 : "");
@@ -852,14 +853,14 @@ te_fence_node(crm_graph_t *graph, crm_ac
 
     delay_i = crm_atoi(priority_delay, "0");
     rc = stonith_api->cmds->fence_with_delay(stonith_api, options, target, type,
-                                             (int) (stonith_timeout / 1000),
+                                             stonith_timeout,
                                              0, delay_i);
 
     transition_key = pcmk__transition_key(transition_graph->id,
                                           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",

Places

File bsc#1210074-0008-Log-controller-log-fencing-timeout-consistently-in-s.patch of Package pacemaker.29826

Places