File bsc#1213125-0001-Fix-controller-do-not-check-whether-watchdog-fencing.patch of Package pacemaker.34780
From 14e9b3e1b539ae1a4d74ea0eaf3da7bb3bd2f4ea Mon Sep 17 00:00:00 2001
From: "Gao,Yan" <ygao@suse.com>
Date: Fri, 7 Jul 2023 16:58:20 +0200
Subject: [PATCH] Fix: controller: do not check whether watchdog fencing is
enabled for the node if `stonith-watchdog-timeout` is not even configured
Previously controld would unconditionally keep invoking
stonith__watchdog_fencing_enabled_for_node_api() even if
`stonith-watchdog-timeout` was not configured, which would also keep
worrying users with the log:
pacemaker-controld[...]: notice: Cluster does not have watchdog fencing device
---
daemons/controld/controld_fencing.c | 8 +++++---
1 file changed, 5 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
@@ -966,11 +966,13 @@ controld_execute_fence_action(pcmk__grap
bool
controld_verify_stonith_watchdog_timeout(const char *value)
{
+ long st_timeout = value? crm_get_msec(value) : 0;
gboolean rv = TRUE;
- if (stonith_api && (stonith_api->state != stonith_disconnected) &&
- stonith__watchdog_fencing_enabled_for_node_api(stonith_api,
- fsa_our_uname)) {
+ if (st_timeout == 0
+ || (stonith_api && (stonith_api->state != stonith_disconnected) &&
+ stonith__watchdog_fencing_enabled_for_node_api(stonith_api,
+ fsa_our_uname))) {
rv = pcmk__valid_sbd_timeout(value);
}
return rv;