File bsc#1174696-0003-Doc-controller-Pacemaker-Explained-improve-the-docum-1.1.patch of Package pacemaker.19778

From 9ee78eef3e9e2f19262eefd25a713c52ecaef3f7 Mon Sep 17 00:00:00 2001
From: "Gao,Yan" <ygao@suse.com>
Date: Fri, 14 Aug 2020 13:31:43 +0200
Subject: [PATCH 3/3] Doc: controller, Pacemaker Explained: improve the
 documentation of `stonith-watchdog-timeout` cluster option

This commit also marks out the default value `0` of
`stonith-watchdog-timeout` cluster option in the metadata of controller
to be consistent with "Pacemaker Explained".
---
 crmd/control.c                               | 19 ++++++++++++++++---
 doc/Pacemaker_Explained/en-US/Ch-Options.txt | 16 ++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/crmd/control.c b/crmd/control.c
index cd4223fd4..bde0a7cbd 100644
--- a/crmd/control.c
+++ b/crmd/control.c
@@ -965,9 +965,22 @@ pe_cluster_option crmd_opts[] = {
           "Delay cluster recovery for the configured interval to allow for additional/related events to occur.\n"
           "Useful if your configuration is sensitive to the order in which ping updates arrive."
         },
-	{ "stonith-watchdog-timeout", NULL, "time", NULL, NULL, &check_sbd_timeout,
-	  "How long to wait before we can assume nodes are safely down", NULL
-        },
+	{ "stonith-watchdog-timeout", NULL, "time", NULL, "0", &check_sbd_timeout,
+        "How long to wait before we can assume nodes are safely down "
+            "when watchdog-based self-fencing via SBD is in use",
+        "If positive, along with `have-watchdog=true` automatically set by the "
+            "cluster, when fencing is required, watchdog-based self-fencing "
+            "will be performed via SBD without requiring a fencing resource "
+            "explicitly configured. "
+            "If `stonith-watchdog-timeout` is set to a positive value, unseen "
+            "nodes are assumed to self-fence within this much time. +WARNING:+ "
+            "It must be ensured that this value is larger than the "
+            "`SBD_WATCHDOG_TIMEOUT` environment variable on all nodes. "
+            "Pacemaker verifies the settings individually on all nodes and "
+            "prevents startup or shuts down if configured wrongly on the fly. "
+            "It's strongly recommended that `SBD_WATCHDOG_TIMEOUT` is set to "
+            "the same value on all nodes. "
+       },
         { "stonith-max-attempts",NULL,"integer",NULL,"10",&check_positive_number,
           "How many times stonith can fail before it will no longer be attempted on a target"
         },   
diff --git a/doc/Pacemaker_Explained/en-US/Ch-Options.txt b/doc/Pacemaker_Explained/en-US/Ch-Options.txt
index 7981cd110..343717d2a 100644
--- a/doc/Pacemaker_Explained/en-US/Ch-Options.txt
+++ b/doc/Pacemaker_Explained/en-US/Ch-Options.txt
@@ -235,6 +235,22 @@ indexterm:[Cluster,Option,stonith-max-attempts]
 How many times fencing can fail for a target before the cluster will no longer
 immediately re-attempt it. '(since 1.1.17)'
 
+| stonith-watchdog-timeout | 0 |
+indexterm:[stonith-watchdog-timeout,Cluster Option]
+indexterm:[Cluster,Option,stonith-watchdog-timeout]
+If positive, along with `have-watchdog=true` automatically set by the
+cluster, when fencing is required, watchdog-based self-fencing
+will be performed via SBD without requiring a fencing resource
+explicitly configured.
+If `stonith-watchdog-timeout` is set to a positive value, unseen
+nodes are assumed to self-fence within this much time. +WARNING:+
+It must be ensured that this value is larger than the
+`SBD_WATCHDOG_TIMEOUT` environment variable on all nodes.
+Pacemaker verifies the settings individually on all nodes and
+prevents startup or shuts down if configured wrongly on the fly.
+It's strongly recommended that `SBD_WATCHDOG_TIMEOUT` is set to
+the same value on all nodes.
+
 | concurrent-fencing | FALSE |
 indexterm:[concurrent-fencing,Cluster Option]
 indexterm:[Cluster,Option,concurrent-fencing]
-- 
2.26.2