File bsc#1210074-0004-Fix-fencer-add-correct-values-... of Package pacemaker.32860

Overview Repositories Revisions Requests Users Attributes Meta

File bsc#1210074-0004-Fix-fencer-add-correct-values-of-pcmk_delay_base-max.patch of Package pacemaker.32860

From a6eef30076076f16cf2219a2eb6a68bf32aa4b60 Mon Sep 17 00:00:00 2001
From: "Gao,Yan" <ygao@suse.com>
Date: Thu, 13 Apr 2023 00:17:14 +0200
Subject: [PATCH 04/11] Fix: fencer: add correct values of pcmk_delay_base/max
 to query rely

Values returned from get_action_delay_base() and get_action_delay_max()
are already in seconds.

Regression in 2.0.4 introduced by 3dec9302e5.

Fixes T93
Fixes CLBZ#5493
---
 cts/cts-fencing.in               |  6 +++---
 daemons/fenced/fenced_commands.c | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

Index: pacemaker-2.1.5+20221208.a3f44794f/cts/cts-fencing.in
===================================================================
--- pacemaker-2.1.5+20221208.a3f44794f.orig/cts/cts-fencing.in
+++ pacemaker-2.1.5+20221208.a3f44794f/cts/cts-fencing.in
@@ -1225,7 +1225,7 @@ class Tests(object):
             test.add_cmd("stonith_admin", "--output-as=xml -F node3 --delay 1")
 
             # Total fencing timeout takes all fencing delays into account.
-            test.add_stonith_log_pattern("Total timeout set to 577")
+            test.add_stonith_log_pattern("Total timeout set to 579")
 
             # Fencing timeout for the first device takes the requested fencing delay into account.
             # Fencing timeout also takes pcmk_delay_base into account.
@@ -1241,7 +1241,7 @@ class Tests(object):
 
             # Fencing timeout takes pcmk_delay_max into account.
             test.add_stonith_log_pattern(r"perform 'off' action targeting node3 using true2")
-            test.add_stonith_log_pattern("Delaying 'off' action targeting node3 using true2 for 1s | timeout=120s requested_delay=0s base=1s max=2s")
+            test.add_stonith_log_pattern("Delaying 'off' action targeting node3 using true2 for 1s | timeout=122s requested_delay=0s base=1s max=2s")
 
             test.add_stonith_neg_log_pattern("Delaying 'off' action targeting node3 using true3")
 
Index: pacemaker-2.1.5+20221208.a3f44794f/daemons/fenced/fenced_commands.c
===================================================================
--- pacemaker-2.1.5+20221208.a3f44794f.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.1.5+20221208.a3f44794f/daemons/fenced/fenced_commands.c
@@ -2319,25 +2319,25 @@ add_action_specific_attributes(xmlNode *
 
     delay_max = get_action_delay_max(device, action);
     if (delay_max > 0) {
-        crm_trace("Action '%s' has maximum random delay %dms using %s",
+        crm_trace("Action '%s' has maximum random delay %ds using %s",
                   action, delay_max, device->id);
-        crm_xml_add_int(xml, F_STONITH_DELAY_MAX, delay_max / 1000);
+        crm_xml_add_int(xml, F_STONITH_DELAY_MAX, delay_max);
     }
 
     delay_base = get_action_delay_base(device, action, target);
     if (delay_base > 0) {
-        crm_xml_add_int(xml, F_STONITH_DELAY_BASE, delay_base / 1000);
+        crm_xml_add_int(xml, F_STONITH_DELAY_BASE, delay_base);
     }
 
     if ((delay_max > 0) && (delay_base == 0)) {
-        crm_trace("Action '%s' has maximum random delay %dms using %s",
+        crm_trace("Action '%s' has maximum random delay %ds using %s",
                   action, delay_max, device->id);
     } else if ((delay_max == 0) && (delay_base > 0)) {
-        crm_trace("Action '%s' has a static delay of %dms using %s",
+        crm_trace("Action '%s' has a static delay of %ds using %s",
                   action, delay_base, device->id);
     } else if ((delay_max > 0) && (delay_base > 0)) {
-        crm_trace("Action '%s' has a minimum delay of %dms and a randomly chosen "
-                  "maximum delay of %dms using %s",
+        crm_trace("Action '%s' has a minimum delay of %ds and a randomly chosen "
+                  "maximum delay of %ds using %s",
                   action, delay_base, delay_max, device->id);
     }
 }

Places

File bsc#1210074-0004-Fix-fencer-add-correct-values-of-pcmk_delay_base-max.patch of Package pacemaker.32860

Places