File 0001-Low-fenced-Correctly-log-the-total-fencing-timeout.patch of Package pacemaker.34780
From c8f12f7e96e7a333dcc7c273b8c99a452368f110 Mon Sep 17 00:00:00 2001
From: Hideo Yamauchi <renayama19661014@ybb.ne.jp>
Date: Tue, 26 Apr 2022 09:18:05 +0900
Subject: [PATCH] Low: fenced: Correctly log the total fencing timeout.
---
daemons/fenced/fenced_remote.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/daemons/fenced/fenced_remote.c b/daemons/fenced/fenced_remote.c
index 8ca1c8534..46356e273 100644
--- a/daemons/fenced/fenced_remote.c
+++ b/daemons/fenced/fenced_remote.c
@@ -1689,14 +1689,12 @@ request_peer_fencing(remote_fencing_op_t *op, peer_device_info_t *peer)
}
if (!op->op_timer_total) {
- int total_timeout = get_op_total_timeout(op, peer);
-
- op->total_timeout = TIMEOUT_MULTIPLY_FACTOR * total_timeout;
+ op->total_timeout = TIMEOUT_MULTIPLY_FACTOR * get_op_total_timeout(op, peer);
op->op_timer_total = g_timeout_add(1000 * op->total_timeout, remote_op_timeout, op);
report_timeout_period(op, op->total_timeout);
crm_info("Total timeout set to %d for peer's fencing targeting %s for %s"
CRM_XS "id=%.8s",
- total_timeout, op->target, op->client_name, op->id);
+ op->total_timeout, op->target, op->client_name, op->id);
}
if (pcmk_is_set(op->call_options, st_opt_topology) && op->devices) {
--
2.35.3