36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
|
From 9a0c1bbc899fff8c5c0de2462726bd128fd35c73 Mon Sep 17 00:00:00 2001
|
||
|
|
From: bizhiyuan <bizhiyuan@kylinos.cn>
|
||
|
|
Date: Tue, 5 Sep 2023 23:47:24 +0800
|
||
|
|
Subject: [PATCH] Fix: controller: do not check whether watchdog fencing is
|
||
|
|
enabled for the node if stonith-watchdog-timeout is not even configured
|
||
|
|
|
||
|
|
---
|
||
|
|
daemons/controld/controld_fencing.c | 8 +++++---
|
||
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/daemons/controld/controld_fencing.c b/daemons/controld/controld_fencing.c
|
||
|
|
index 89cb61f..84591b6 100644
|
||
|
|
--- a/daemons/controld/controld_fencing.c
|
||
|
|
+++ b/daemons/controld/controld_fencing.c
|
||
|
|
@@ -1000,12 +1000,14 @@ controld_execute_fence_action(pcmk__graph_t *graph,
|
||
|
|
bool
|
||
|
|
controld_verify_stonith_watchdog_timeout(const char *value)
|
||
|
|
{
|
||
|
|
+ long st_timeout = value? crm_get_msec(value) : 0;
|
||
|
|
const char *our_nodename = controld_globals.our_nodename;
|
||
|
|
gboolean rv = TRUE;
|
||
|
|
|
||
|
|
- if (stonith_api && (stonith_api->state != stonith_disconnected) &&
|
||
|
|
- stonith__watchdog_fencing_enabled_for_node_api(stonith_api,
|
||
|
|
- our_nodename)) {
|
||
|
|
+ if (st_timeout == 0
|
||
|
|
+ || (stonith_api && (stonith_api->state != stonith_disconnected) &&
|
||
|
|
+ stonith__watchdog_fencing_enabled_for_node_api(stonith_api,
|
||
|
|
+ our_nodename))) {
|
||
|
|
rv = pcmk__valid_sbd_timeout(value);
|
||
|
|
}
|
||
|
|
return rv;
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|