Skip to content

Fix: fencer: Make the deprecated "stonith-watchdog-timeout" option work again #4068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gao-yan wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −1
Open

Fix: fencer: Make the deprecated "stonith-watchdog-timeout" option work again #4068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions daemons/fenced/fenced_cib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,15 @@ fencing_topology_init(void)
"[@" PCMK_XA_NAME "='" \
PCMK_OPT_FENCING_WATCHDOG_TIMEOUT "']"

/* @COMPAT The "stonith-watchdog-timeout" option has been a deprecated alias
* for "fencing-watchdog-timeout" since 3.0.2. Make sure it still works as a
* fallback until it's dropped in a future release.
*/
#define XPATH_STONITH_WATCHDOG_TIMEOUT "//" PCMK_XE_NVPAIR \
"[@" PCMK_XA_NAME \
"='stonith-watchdog-timeout']"


static void
update_fencing_watchdog_timeout_ms(xmlNode *cib)
{
Expand All @@ -157,6 +166,17 @@ update_fencing_watchdog_timeout_ms(xmlNode *cib)
stonith_watchdog_xml = pcmk__xpath_find_one(cib->doc,
XPATH_WATCHDOG_TIMEOUT,
PCMK__LOG_NEVER);

/* @COMPAT The "stonith-watchdog-timeout" option has been a deprecated alias
* for "fencing-watchdog-timeout" since 3.0.2. Make sure it still works as a
* fallback until it's dropped in a future release.
*/
if (stonith_watchdog_xml == NULL) {
stonith_watchdog_xml = pcmk__xpath_find_one(cib->doc,
XPATH_STONITH_WATCHDOG_TIMEOUT,
PCMK__LOG_NEVER);
}

if (stonith_watchdog_xml == NULL) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/lrmd/lrmd_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ lrmd__validate_remote_settings(lrmd_t *lrmd, GHashTable *hash)

pcmk__xe_set(data, PCMK__XA_LRMD_ORIGIN, __func__);

value = g_hash_table_lookup(hash, PCMK_OPT_FENCING_WATCHDOG_TIMEOUT);
value = pcmk__cluster_option(hash, PCMK_OPT_FENCING_WATCHDOG_TIMEOUT);
if ((value) &&
(stonith__watchdog_fencing_enabled_for_node(native->remote_nodename))) {
pcmk__xe_set(data, PCMK__XA_LRMD_WATCHDOG, value);
Expand Down