87bc6c8acd
- Detect an unresponsive subdaemon - Handle certain probe failures as stopped instead of failed - Update pcmk_delay_base option meta-data - Avoid crash when using clone notifications - Retry Corosync shutdown tracking if first attempt fails - Improve display of failed actions - Resolves: rhbz1707851 - Resolves: rhbz2039982 - Resolves: rhbz2032032 - Resolves: rhbz2040443 - Resolves: rhbz2042367 - Resolves: rhbz2042546
44 lines
2.3 KiB
Diff
44 lines
2.3 KiB
Diff
From 9d812b0401d4cedef53a3cc3653ec782a5c49e37 Mon Sep 17 00:00:00 2001
|
|
From: Ken Gaillot <kgaillot@redhat.com>
|
|
Date: Thu, 13 Jan 2022 10:42:02 -0600
|
|
Subject: [PATCH] Doc: fencer: improve pcmk_delay_base meta-data
|
|
|
|
Update its type, since its value can now be a node map as well as a string,
|
|
and add more detail to its description.
|
|
---
|
|
daemons/fenced/pacemaker-fenced.c | 18 +++++++++++-------
|
|
1 file changed, 11 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/daemons/fenced/pacemaker-fenced.c b/daemons/fenced/pacemaker-fenced.c
|
|
index 1b954be5a4..12f331496c 100644
|
|
--- a/daemons/fenced/pacemaker-fenced.c
|
|
+++ b/daemons/fenced/pacemaker-fenced.c
|
|
@@ -1548,13 +1548,17 @@ main(int argc, char **argv)
|
|
PCMK_STONITH_DELAY_BASE);
|
|
printf(" <shortdesc lang=\"en\">Enable a base delay for "
|
|
"fencing actions and specify base delay value.</shortdesc>\n");
|
|
- printf(" <longdesc lang=\"en\">This prevents double fencing when "
|
|
- "different delays are configured on the nodes.\nUse this to "
|
|
- "enable a static delay for fencing actions.\nThe overall delay "
|
|
- "is derived from a random delay value adding this static delay "
|
|
- "so that the sum is kept below the maximum delay.\nSet to eg. "
|
|
- "node1:1s;node2:5 to set different value per node.</longdesc>\n");
|
|
- printf(" <content type=\"time\" default=\"0s\"/>\n");
|
|
+ printf(" <longdesc lang=\"en\">This enables a static delay for "
|
|
+ "fencing actions, which can help avoid \"death matches\" where "
|
|
+ "two nodes try to fence each other at the same time. If "
|
|
+ PCMK_STONITH_DELAY_MAX " is also used, a random delay will be "
|
|
+ "added such that the total delay is kept below that value.\n"
|
|
+ "This can be set to a single time value to apply to any node "
|
|
+ "targeted by this device (useful if a separate device is "
|
|
+ "configured for each target), or to a node map (for example, "
|
|
+ "\"node1:1s;node2:5\") to set a different value per target.\n"
|
|
+ " </longdesc>\n");
|
|
+ printf(" <content type=\"string\" default=\"0s\"/>\n");
|
|
printf(" </parameter>\n");
|
|
|
|
printf(" <parameter name=\"%s\" unique=\"0\">\n",
|
|
--
|
|
2.27.0
|
|
|