diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 07:46:09 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 07:46:09 +0000 |
| commit | 043aa641ad4373e96fd748deb1e7fab3cb579a07 (patch) | |
| tree | f8fde8a97ab5db152043f6c01043672114c0a4df /lib/fencing/st_lha.c | |
| parent | Releasing progress-linux version 2.1.6-5~progress7.99u1. (diff) | |
| download | pacemaker-043aa641ad4373e96fd748deb1e7fab3cb579a07.tar.xz pacemaker-043aa641ad4373e96fd748deb1e7fab3cb579a07.zip | |
Merging upstream version 2.1.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/fencing/st_lha.c')
| -rw-r--r-- | lib/fencing/st_lha.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/fencing/st_lha.c b/lib/fencing/st_lha.c index d477ded..fd26217 100644 --- a/lib/fencing/st_lha.c +++ b/lib/fencing/st_lha.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2022 the Pacemaker project contributors + * Copyright 2004-2023 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -41,10 +41,10 @@ static const char META_TEMPLATE[] = " <shortdesc lang=\"en\">%s</shortdesc>\n" "%s\n" " <actions>\n" - " <action name=\"start\" timeout=\"20\" />\n" + " <action name=\"start\" timeout=\"%s\" />\n" " <action name=\"stop\" timeout=\"15\" />\n" - " <action name=\"status\" timeout=\"20\" />\n" - " <action name=\"monitor\" timeout=\"20\" interval=\"3600\"/>\n" + " <action name=\"status\" timeout=\"%s\" />\n" + " <action name=\"monitor\" timeout=\"%s\" interval=\"3600\"/>\n" " <action name=\"meta-data\" timeout=\"15\" />\n" " </actions>\n" " <special tag=\"heartbeat\">\n" @@ -200,6 +200,7 @@ stonith__lha_metadata(const char *agent, int timeout, char **output) char *meta_param = NULL; char *meta_longdesc = NULL; char *meta_shortdesc = NULL; + const char *timeout_str = NULL; stonith_obj = (*st_new_fn) (agent); if (stonith_obj) { @@ -236,8 +237,10 @@ stonith__lha_metadata(const char *agent, int timeout, char **output) xml_meta_shortdesc = (char *)xmlEncodeEntitiesReentrant(NULL, (const unsigned char *)meta_shortdesc); + timeout_str = pcmk__readable_interval(PCMK_DEFAULT_ACTION_TIMEOUT_MS); buffer = crm_strdup_printf(META_TEMPLATE, agent, xml_meta_longdesc, - xml_meta_shortdesc, meta_param); + xml_meta_shortdesc, meta_param, + timeout_str, timeout_str, timeout_str); xmlFree(xml_meta_longdesc); xmlFree(xml_meta_shortdesc); |