Compare commits
No commits in common. "imports/c8s/pacemaker-2.1.2-3.el8" and "c8" have entirely different histories.
imports/c8
...
c8
|
|
@ -1,2 +1,2 @@
|
|||
SOURCES/nagios-agents-metadata-105ab8a.tar.gz
|
||||
SOURCES/pacemaker-ada5c3b.tar.gz
|
||||
SOURCES/pacemaker-0f7f88312.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
ea6c0a27fd0ae8ce02f84a11f08a0d79377041c3 SOURCES/nagios-agents-metadata-105ab8a.tar.gz
|
||||
f9fd69263d5b21446b530f9750c262f7b492cad4 SOURCES/pacemaker-ada5c3b.tar.gz
|
||||
88946a460e3be18852861269f8837aaaf339328c SOURCES/pacemaker-0f7f88312.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,230 +0,0 @@
|
|||
From f5ffbaf1f537d3d5b00e594211cd322f97df51ac Mon Sep 17 00:00:00 2001
|
||||
From: Grace Chin <gchin@redhat.com>
|
||||
Date: Fri, 5 Nov 2021 11:39:39 -0400
|
||||
Subject: [PATCH 1/3] Low: xml: clone acls schema in preparation for changes
|
||||
|
||||
---
|
||||
xml/acls-3.8.rng | 80 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 80 insertions(+)
|
||||
create mode 100644 xml/acls-3.8.rng
|
||||
|
||||
diff --git a/xml/acls-3.8.rng b/xml/acls-3.8.rng
|
||||
new file mode 100644
|
||||
index 000000000..0fe6eed96
|
||||
--- /dev/null
|
||||
+++ b/xml/acls-3.8.rng
|
||||
@@ -0,0 +1,80 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<grammar xmlns="http://relaxng.org/ns/structure/1.0"
|
||||
+ datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
||||
+ <start>
|
||||
+ <optional>
|
||||
+ <ref name="element-acls"/>
|
||||
+ </optional>
|
||||
+ </start>
|
||||
+
|
||||
+ <define name="element-acls">
|
||||
+ <element name="acls">
|
||||
+ <zeroOrMore>
|
||||
+ <choice>
|
||||
+ <element name="acl_target">
|
||||
+ <attribute name="id"><text/></attribute>
|
||||
+ <zeroOrMore>
|
||||
+ <element name="role">
|
||||
+ <attribute name="id"><data type="IDREF"/></attribute>
|
||||
+ </element>
|
||||
+ </zeroOrMore>
|
||||
+ </element>
|
||||
+ <element name="acl_group">
|
||||
+ <!-- Here 'id' is the name of a unix group -->
|
||||
+ <attribute name="id"><data type="ID"/></attribute>
|
||||
+ <zeroOrMore>
|
||||
+ <element name="role">
|
||||
+ <attribute name="id"><data type="IDREF"/></attribute>
|
||||
+ </element>
|
||||
+ </zeroOrMore>
|
||||
+ </element>
|
||||
+ <element name="acl_role">
|
||||
+ <attribute name="id"><data type="ID"/></attribute>
|
||||
+ <optional>
|
||||
+ <attribute name="description"><text/></attribute>
|
||||
+ </optional>
|
||||
+ <zeroOrMore>
|
||||
+ <ref name="element-permission"/>
|
||||
+ </zeroOrMore>
|
||||
+ </element>
|
||||
+ </choice>
|
||||
+ </zeroOrMore>
|
||||
+ </element>
|
||||
+ </define>
|
||||
+
|
||||
+ <define name="element-permission">
|
||||
+ <element name="acl_permission">
|
||||
+ <attribute name="id"><data type="ID"/></attribute>
|
||||
+
|
||||
+ <attribute name="kind">
|
||||
+ <choice>
|
||||
+ <value>read</value>
|
||||
+ <value>write</value>
|
||||
+ <value>deny</value>
|
||||
+ </choice>
|
||||
+ </attribute>
|
||||
+
|
||||
+ <choice>
|
||||
+ <attribute name="xpath"><text/></attribute>
|
||||
+ <!-- reference is already sufficiently specific without 'object-type' -->
|
||||
+ <attribute name="reference"><data type="IDREF"/></attribute>
|
||||
+ <group>
|
||||
+ <!-- Use 'object-type' to avoid conflicting with the 'tag' configuration concept -->
|
||||
+ <attribute name="object-type"><text/></attribute>
|
||||
+ <optional>
|
||||
+ <!--
|
||||
+ does not make sense with anything other than object-type
|
||||
+ xpath and reference are already sufficiently specific
|
||||
+ -->
|
||||
+ <attribute name="attribute"><text/></attribute>
|
||||
+ </optional>
|
||||
+ </group>
|
||||
+ </choice>
|
||||
+
|
||||
+ <optional>
|
||||
+ <attribute name="description"><text/></attribute>
|
||||
+ </optional>
|
||||
+ </element>
|
||||
+ </define>
|
||||
+
|
||||
+</grammar>
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 7838213fc639236bdedf5f15320152d973f1bdad Mon Sep 17 00:00:00 2001
|
||||
From: Grace Chin <gchin@redhat.com>
|
||||
Date: Fri, 5 Nov 2021 11:40:48 -0400
|
||||
Subject: [PATCH 2/3] Add a 'name' attribute to acl_target and acl_group
|
||||
elements
|
||||
|
||||
---
|
||||
xml/acls-3.8.rng | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/xml/acls-3.8.rng b/xml/acls-3.8.rng
|
||||
index 0fe6eed96..48bcdffe3 100644
|
||||
--- a/xml/acls-3.8.rng
|
||||
+++ b/xml/acls-3.8.rng
|
||||
@@ -13,6 +13,9 @@
|
||||
<choice>
|
||||
<element name="acl_target">
|
||||
<attribute name="id"><text/></attribute>
|
||||
+ <optional>
|
||||
+ <attribute name="name"><text/></attribute>
|
||||
+ </optional>
|
||||
<zeroOrMore>
|
||||
<element name="role">
|
||||
<attribute name="id"><data type="IDREF"/></attribute>
|
||||
@@ -22,6 +25,9 @@
|
||||
<element name="acl_group">
|
||||
<!-- Here 'id' is the name of a unix group -->
|
||||
<attribute name="id"><data type="ID"/></attribute>
|
||||
+ <optional>
|
||||
+ <attribute name="name"><text/></attribute>
|
||||
+ </optional>
|
||||
<zeroOrMore>
|
||||
<element name="role">
|
||||
<attribute name="id"><data type="IDREF"/></attribute>
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From c3c498f4636f57e29670f8e385b625024ed222d7 Mon Sep 17 00:00:00 2001
|
||||
From: Grace Chin <gchin@redhat.com>
|
||||
Date: Fri, 5 Nov 2021 11:42:48 -0400
|
||||
Subject: [PATCH 3/3] Changes made by run of 'cts/cts-cli -s'
|
||||
|
||||
---
|
||||
cts/cli/regression.upgrade.exp | 7 +++++--
|
||||
cts/cli/regression.validity.exp | 22 ++++++++++++++++++----
|
||||
2 files changed, 23 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/cts/cli/regression.upgrade.exp b/cts/cli/regression.upgrade.exp
|
||||
index e38adebdd..7ce7ec13b 100644
|
||||
--- a/cts/cli/regression.upgrade.exp
|
||||
+++ b/cts/cli/regression.upgrade.exp
|
||||
@@ -91,8 +91,11 @@ update_validation debug: Configuration valid for schema: pacemaker-3.6
|
||||
update_validation debug: pacemaker-3.6-style configuration is also valid for pacemaker-3.7
|
||||
update_validation debug: Testing 'pacemaker-3.7' validation (21 of X)
|
||||
update_validation debug: Configuration valid for schema: pacemaker-3.7
|
||||
-update_validation trace: Stopping at pacemaker-3.7
|
||||
-update_validation info: Transformed the configuration from pacemaker-2.10 to pacemaker-3.7
|
||||
+update_validation debug: pacemaker-3.7-style configuration is also valid for pacemaker-3.8
|
||||
+update_validation debug: Testing 'pacemaker-3.8' validation (22 of X)
|
||||
+update_validation debug: Configuration valid for schema: pacemaker-3.8
|
||||
+update_validation trace: Stopping at pacemaker-3.8
|
||||
+update_validation info: Transformed the configuration from pacemaker-2.10 to pacemaker-3.8
|
||||
=#=#=#= Current cib after: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#=
|
||||
<cib epoch="2" num_updates="0" admin_epoch="1">
|
||||
<configuration>
|
||||
diff --git a/cts/cli/regression.validity.exp b/cts/cli/regression.validity.exp
|
||||
index 5ace430e7..125035a47 100644
|
||||
--- a/cts/cli/regression.validity.exp
|
||||
+++ b/cts/cli/regression.validity.exp
|
||||
@@ -121,7 +121,11 @@ update_validation debug: Testing 'pacemaker-3.7' validation (21 of X)
|
||||
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
||||
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
||||
update_validation trace: pacemaker-3.7 validation failed
|
||||
-Cannot upgrade configuration (claiming schema pacemaker-1.2) to at least pacemaker-3.0 because it does not validate with any schema from pacemaker-1.2 to pacemaker-3.7
|
||||
+update_validation debug: Testing 'pacemaker-3.8' validation (22 of X)
|
||||
+element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
||||
+element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
||||
+update_validation trace: pacemaker-3.8 validation failed
|
||||
+Cannot upgrade configuration (claiming schema pacemaker-1.2) to at least pacemaker-3.0 because it does not validate with any schema from pacemaker-1.2 to pacemaker-3.8
|
||||
=#=#=#= End test: Run crm_simulate with invalid CIB (enum violation) - Invalid configuration (78) =#=#=#=
|
||||
* Passed: crm_simulate - Run crm_simulate with invalid CIB (enum violation)
|
||||
=#=#=#= Begin test: Try to make resulting CIB invalid (unrecognized validate-with) =#=#=#=
|
||||
@@ -226,7 +230,10 @@ update_validation trace: pacemaker-3.6 validation failed
|
||||
update_validation debug: Testing 'pacemaker-3.7' validation (21 of X)
|
||||
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
|
||||
update_validation trace: pacemaker-3.7 validation failed
|
||||
-Cannot upgrade configuration (claiming schema pacemaker-9999.0) to at least pacemaker-3.0 because it does not validate with any schema from unknown to pacemaker-3.7
|
||||
+update_validation debug: Testing 'pacemaker-3.8' validation (22 of X)
|
||||
+element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
|
||||
+update_validation trace: pacemaker-3.8 validation failed
|
||||
+Cannot upgrade configuration (claiming schema pacemaker-9999.0) to at least pacemaker-3.0 because it does not validate with any schema from unknown to pacemaker-3.8
|
||||
=#=#=#= End test: Run crm_simulate with invalid CIB (unrecognized validate-with) - Invalid configuration (78) =#=#=#=
|
||||
* Passed: crm_simulate - Run crm_simulate with invalid CIB (unrecognized validate-with)
|
||||
=#=#=#= Begin test: Try to make resulting CIB invalid, but possibly recoverable (valid with X.Y+1) =#=#=#=
|
||||
@@ -326,8 +333,11 @@ update_validation debug: Configuration valid for schema: pacemaker-3.6
|
||||
update_validation debug: pacemaker-3.6-style configuration is also valid for pacemaker-3.7
|
||||
update_validation debug: Testing 'pacemaker-3.7' validation (21 of X)
|
||||
update_validation debug: Configuration valid for schema: pacemaker-3.7
|
||||
-update_validation trace: Stopping at pacemaker-3.7
|
||||
-update_validation info: Transformed the configuration from pacemaker-1.2 to pacemaker-3.7
|
||||
+update_validation debug: pacemaker-3.7-style configuration is also valid for pacemaker-3.8
|
||||
+update_validation debug: Testing 'pacemaker-3.8' validation (22 of X)
|
||||
+update_validation debug: Configuration valid for schema: pacemaker-3.8
|
||||
+update_validation trace: Stopping at pacemaker-3.8
|
||||
+update_validation info: Transformed the configuration from pacemaker-1.2 to pacemaker-3.8
|
||||
unpack_resources error: Resource start-up disabled since no STONITH resources have been defined
|
||||
unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option
|
||||
unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity
|
||||
@@ -437,6 +447,8 @@ element rsc_order: Relax-NG validity error : Invalid attribute first-action for
|
||||
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
||||
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
||||
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
||||
+element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
||||
+element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
||||
=#=#=#= Current cib after: Make resulting CIB invalid, and without validate-with attribute =#=#=#=
|
||||
<cib epoch="41" num_updates="0" admin_epoch="0" validate-with="none">
|
||||
<configuration>
|
||||
@@ -502,6 +514,8 @@ validity.bad.xml:10: element rsc_order: Relax-NG validity error : Invalid attrib
|
||||
validity.bad.xml:10: element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
||||
validity.bad.xml:10: element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
||||
validity.bad.xml:10: element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
||||
+validity.bad.xml:10: element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
||||
+validity.bad.xml:10: element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
||||
unpack_resources error: Resource start-up disabled since no STONITH resources have been defined
|
||||
unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option
|
||||
unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity
|
||||
--
|
||||
2.27.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,42 @@
|
|||
From a3bffc7c66bf6f796f977cffd44f223635b008c5 Mon Sep 17 00:00:00 2001
|
||||
From: Reid Wahl <nrwahl@protonmail.com>
|
||||
Date: Wed, 20 Dec 2023 13:33:47 -0800
|
||||
Subject: [PATCH] Doc: Pacemaker Explained: Add replace for
|
||||
PCMK__REMOTE_SCHEMA_DIR
|
||||
|
||||
So that the existing use in local-options.rst expands correctly.
|
||||
|
||||
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
|
||||
---
|
||||
doc/sphinx/Makefile.am | 1 +
|
||||
doc/sphinx/conf.py.in | 1 +
|
||||
3 files changed, 2 insertions(+)
|
||||
create mode 100644 doc/sphinx/conf.py.in.rej
|
||||
|
||||
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
|
||||
index e48e19a..d0309ff 100644
|
||||
--- a/doc/sphinx/Makefile.am
|
||||
+++ b/doc/sphinx/Makefile.am
|
||||
@@ -134,6 +134,7 @@ $(BOOKS:%=%/conf.py): conf.py.in
|
||||
-e 's#%CRM_SCHEMA_DIRECTORY%#@CRM_SCHEMA_DIRECTORY@#g' \
|
||||
-e 's#%PACEMAKER_CONFIG_DIR%#@PACEMAKER_CONFIG_DIR@#g' \
|
||||
-e 's#%PCMK_GNUTLS_PRIORITIES%#@PCMK_GNUTLS_PRIORITIES@#g' \
|
||||
+ -e 's#%PCMK__REMOTE_SCHEMA_DIR%#@PCMK__REMOTE_SCHEMA_DIR@#g' \
|
||||
$(<) > "$@"
|
||||
|
||||
$(BOOK)/_build: $(STATIC_FILES) $(BOOK)/conf.py $(DEPS_$(BOOK)) $(wildcard $(srcdir)/$(BOOK)/*.rst)
|
||||
diff --git a/doc/sphinx/conf.py.in b/doc/sphinx/conf.py.in
|
||||
index 556eb72..511f029 100644
|
||||
--- a/doc/sphinx/conf.py.in
|
||||
+++ b/doc/sphinx/conf.py.in
|
||||
@@ -40,6 +40,7 @@ rst_prolog="""
|
||||
.. |PCMK_INIT_ENV_FILE| replace:: ``%PACEMAKER_CONFIG_DIR%/pcmk-init.env``
|
||||
.. |PCMK_LOG_FILE| replace:: %CRM_LOG_DIR%/pacemaker.log
|
||||
.. |PCMK_GNUTLS_PRIORITIES| replace:: %PCMK_GNUTLS_PRIORITIES%
|
||||
+.. |PCMK__REMOTE_SCHEMA_DIR| replace:: %PCMK__REMOTE_SCHEMA_DIR%
|
||||
.. |REMOTE_DISTRO| replace:: AlmaLinux
|
||||
.. |REMOTE_DISTRO_VER| replace:: 9
|
||||
"""
|
||||
--
|
||||
2.31.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,73 +0,0 @@
|
|||
From 09ef95a2eed48b4eb7488788a1b655d67eafe783 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Lumens <clumens@redhat.com>
|
||||
Date: Tue, 30 Nov 2021 14:47:12 -0500
|
||||
Subject: [PATCH] Low: libcrmservice: Handle systemd service templates.
|
||||
|
||||
These unit files (which have an @ sign at the end) expect to be
|
||||
parameterized by an instance name. Not providing an instance name
|
||||
causes the dbus lookup to fail, and we fall back to assume this is an
|
||||
LSB service. If the user doesn't provide an instance name, just add a
|
||||
fake one. It doesn't seem to matter what name is given for the lookup.
|
||||
|
||||
See: rhbz#2003151
|
||||
---
|
||||
lib/services/systemd.c | 22 ++++++++++++++++------
|
||||
1 file changed, 16 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/lib/services/systemd.c b/lib/services/systemd.c
|
||||
index 8e9fff484..27a3b376d 100644
|
||||
--- a/lib/services/systemd.c
|
||||
+++ b/lib/services/systemd.c
|
||||
@@ -206,17 +206,27 @@ systemd_unit_extension(const char *name)
|
||||
}
|
||||
|
||||
static char *
|
||||
-systemd_service_name(const char *name)
|
||||
+systemd_service_name(const char *name, bool add_instance_name)
|
||||
{
|
||||
- if (name == NULL) {
|
||||
+ if (pcmk__str_empty(name)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (systemd_unit_extension(name)) {
|
||||
return strdup(name);
|
||||
- }
|
||||
|
||||
- return crm_strdup_printf("%s.service", name);
|
||||
+ /* Services that end with an @ sign are systemd templates. They expect an
|
||||
+ * instance name to follow the service name. If no instance name was
|
||||
+ * provided, just add "x" to the string as the instance name. It doesn't
|
||||
+ * seem to matter for purposes of looking up whether a service exists or
|
||||
+ * not.
|
||||
+ */
|
||||
+ } else if (add_instance_name && *(name+strlen(name)-1) == '@') {
|
||||
+ return crm_strdup_printf("%sx.service", name);
|
||||
+
|
||||
+ } else {
|
||||
+ return crm_strdup_printf("%s.service", name);
|
||||
+ }
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -427,7 +437,7 @@ invoke_unit_by_name(const char *arg_name, svc_action_t *op, char **path)
|
||||
CRM_ASSERT(msg != NULL);
|
||||
|
||||
// Add the (expanded) unit name as the argument
|
||||
- name = systemd_service_name(arg_name);
|
||||
+ name = systemd_service_name(arg_name, op == NULL || pcmk__str_eq(op->action, "meta-data", pcmk__str_none));
|
||||
CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_STRING, &name,
|
||||
DBUS_TYPE_INVALID));
|
||||
free(name);
|
||||
@@ -944,7 +954,7 @@ invoke_unit_by_path(svc_action_t *op, const char *unit)
|
||||
/* (ss) */
|
||||
{
|
||||
const char *replace_s = "replace";
|
||||
- char *name = systemd_service_name(op->agent);
|
||||
+ char *name = systemd_service_name(op->agent, pcmk__str_eq(op->action, "meta-data", pcmk__str_none));
|
||||
|
||||
CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID));
|
||||
CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_STRING, &replace_s, DBUS_TYPE_INVALID));
|
||||
--
|
||||
2.27.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,276 @@
|
|||
From d50bbafc32428e873c0052a9defcf93d2e52667e Mon Sep 17 00:00:00 2001
|
||||
From: Chris Lumens <clumens@redhat.com>
|
||||
Date: Wed, 10 Jan 2024 11:35:11 -0500
|
||||
Subject: [PATCH 1/3] Refactor: libcrmcommon: Split feature set check into its
|
||||
own function.
|
||||
|
||||
---
|
||||
include/crm/common/cib_internal.h | 4 +++-
|
||||
lib/cib/cib_utils.c | 12 ++++++------
|
||||
lib/common/cib.c | 18 +++++++++++++++++-
|
||||
3 files changed, 26 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/include/crm/common/cib_internal.h b/include/crm/common/cib_internal.h
|
||||
index c41c12e..fa65e58 100644
|
||||
--- a/include/crm/common/cib_internal.h
|
||||
+++ b/include/crm/common/cib_internal.h
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright 2023 the Pacemaker project contributors
|
||||
+ * Copyright 2023-2024 the Pacemaker project contributors
|
||||
*
|
||||
* The version control history for this file may have further details.
|
||||
*
|
||||
@@ -16,6 +16,8 @@ extern "C" {
|
||||
|
||||
const char *pcmk__cib_abs_xpath_for(const char *element);
|
||||
|
||||
+int pcmk__check_feature_set(const char *cib_version);
|
||||
+
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
diff --git a/lib/cib/cib_utils.c b/lib/cib/cib_utils.c
|
||||
index 0082eef..bf2982c 100644
|
||||
--- a/lib/cib/cib_utils.c
|
||||
+++ b/lib/cib/cib_utils.c
|
||||
@@ -353,7 +353,6 @@ cib_perform_op(const char *op, int call_options, cib__op_fn_t fn, bool is_query,
|
||||
xmlNode *patchset_cib = NULL;
|
||||
xmlNode *local_diff = NULL;
|
||||
|
||||
- const char *new_version = NULL;
|
||||
const char *user = crm_element_value(req, F_CIB_USER);
|
||||
bool with_digest = false;
|
||||
|
||||
@@ -470,12 +469,13 @@ cib_perform_op(const char *op, int call_options, cib__op_fn_t fn, bool is_query,
|
||||
}
|
||||
|
||||
if (scratch) {
|
||||
- new_version = crm_element_value(scratch, XML_ATTR_CRM_VERSION);
|
||||
+ const char *new_version = crm_element_value(scratch, XML_ATTR_CRM_VERSION);
|
||||
|
||||
- if (new_version && compare_version(new_version, CRM_FEATURE_SET) > 0) {
|
||||
- crm_err("Discarding update with feature set '%s' greater than our own '%s'",
|
||||
- new_version, CRM_FEATURE_SET);
|
||||
- rc = -EPROTONOSUPPORT;
|
||||
+ rc = pcmk__check_feature_set(new_version);
|
||||
+ if (rc != pcmk_rc_ok) {
|
||||
+ pcmk__config_err("Discarding update with feature set '%s' greater than our own '%s'",
|
||||
+ new_version, CRM_FEATURE_SET);
|
||||
+ rc = pcmk_rc2legacy(rc);
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
diff --git a/lib/common/cib.c b/lib/common/cib.c
|
||||
index fee7881..cbebc2e 100644
|
||||
--- a/lib/common/cib.c
|
||||
+++ b/lib/common/cib.c
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Original copyright 2004 International Business Machines
|
||||
- * Later changes copyright 2008-2023 the Pacemaker project contributors
|
||||
+ * Later changes copyright 2008-2024 the Pacemaker project contributors
|
||||
*
|
||||
* The version control history for this file may have further details.
|
||||
*
|
||||
@@ -173,3 +173,19 @@ pcmk_find_cib_element(xmlNode *cib, const char *element_name)
|
||||
{
|
||||
return get_xpath_object(pcmk_cib_xpath_for(element_name), cib, LOG_TRACE);
|
||||
}
|
||||
+
|
||||
+/*!
|
||||
+ * \internal
|
||||
+ * \brief Check that the feature set in the CIB is supported on this node
|
||||
+ *
|
||||
+ * \param[in] new_version XML_ATTR_CRM_VERSION attribute from the CIB
|
||||
+ */
|
||||
+int
|
||||
+pcmk__check_feature_set(const char *cib_version)
|
||||
+{
|
||||
+ if (cib_version && compare_version(cib_version, CRM_FEATURE_SET) > 0) {
|
||||
+ return EPROTONOSUPPORT;
|
||||
+ }
|
||||
+
|
||||
+ return pcmk_rc_ok;
|
||||
+}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
From d89fd8336ae47d892201513c99773705d57f15f0 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Lumens <clumens@redhat.com>
|
||||
Date: Wed, 10 Jan 2024 13:46:42 -0500
|
||||
Subject: [PATCH 2/3] Feature: scheduler: Check the CIB feature set in
|
||||
cluster_status.
|
||||
|
||||
This adds the check that was previously only in cib_perform_op to the
|
||||
scheduler code, ensuring that any daemon or tool that calls the
|
||||
scheduler will check that the feature set in the CIB is supported.
|
||||
---
|
||||
lib/pengine/status.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/lib/pengine/status.c b/lib/pengine/status.c
|
||||
index e6ec237..1294803 100644
|
||||
--- a/lib/pengine/status.c
|
||||
+++ b/lib/pengine/status.c
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <crm/crm.h>
|
||||
#include <crm/msg_xml.h>
|
||||
#include <crm/common/xml.h>
|
||||
+#include <crm/common/cib_internal.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
@@ -70,12 +71,21 @@ pe_free_working_set(pcmk_scheduler_t *scheduler)
|
||||
gboolean
|
||||
cluster_status(pcmk_scheduler_t * scheduler)
|
||||
{
|
||||
+ const char *new_version = NULL;
|
||||
xmlNode *section = NULL;
|
||||
|
||||
if ((scheduler == NULL) || (scheduler->input == NULL)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+ new_version = crm_element_value(scheduler->input, XML_ATTR_CRM_VERSION);
|
||||
+
|
||||
+ if (pcmk__check_feature_set(new_version) != pcmk_rc_ok) {
|
||||
+ pcmk__config_err("Can't process CIB with feature set '%s' greater than our own '%s'",
|
||||
+ new_version, CRM_FEATURE_SET);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
crm_trace("Beginning unpack");
|
||||
|
||||
if (scheduler->failed != NULL) {
|
||||
--
|
||||
2.31.1
|
||||
|
||||
From a3428926d37af506014a6b462d1308d8541c5932 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Lumens <clumens@redhat.com>
|
||||
Date: Wed, 10 Jan 2024 14:56:36 -0500
|
||||
Subject: [PATCH 3/3] Low: libcib: Do not check CIB feature set for files in
|
||||
cib_perform_op.
|
||||
|
||||
This is related to the previous feature for transferring schema files to
|
||||
older remote nodes. In that case, the newer schema files may also have
|
||||
a newer feature set than the node supports, so the transferred files are
|
||||
still not usable.
|
||||
|
||||
However, the feature set only matters for the scheduler, not for most
|
||||
command line tools (obviously, crm_simulate would still care). So in
|
||||
those cases, we can just disable the feature set check if the CIB was
|
||||
read in from a file. For the scheduler, the check is still performed as
|
||||
part of cluster_status.
|
||||
---
|
||||
cts/cli/regression.tools.exp | 2 +-
|
||||
daemons/based/based_callbacks.c | 4 ++--
|
||||
include/crm/cib/internal.h | 4 ++--
|
||||
lib/cib/cib_file.c | 2 +-
|
||||
lib/cib/cib_utils.c | 15 +++++++++------
|
||||
5 files changed, 15 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/cts/cli/regression.tools.exp b/cts/cli/regression.tools.exp
|
||||
index 417b5cd..c81c420 100644
|
||||
--- a/cts/cli/regression.tools.exp
|
||||
+++ b/cts/cli/regression.tools.exp
|
||||
@@ -7939,7 +7939,7 @@ unpack_config warning: Blind faith: not fencing unseen nodes
|
||||
=#=#=#= End test: Verbosely verify a file-specified invalid configuration, outputting as xml - Invalid configuration (78) =#=#=#=
|
||||
* Passed: crm_verify - Verbosely verify a file-specified invalid configuration, outputting as xml
|
||||
=#=#=#= Begin test: Verbosely verify another file-specified invalid configuration, outputting as xml =#=#=#=
|
||||
-(cluster_status@status.c:113) warning: Fencing and resource management disabled due to lack of quorum
|
||||
+(cluster_status@status.c:123) warning: Fencing and resource management disabled due to lack of quorum
|
||||
<pacemaker-result api-version="X" request="crm_verify_invalid_no_stonith.xml --output-as=xml --verbose">
|
||||
<status code="78" message="Invalid configuration">
|
||||
<errors>
|
||||
diff --git a/daemons/based/based_callbacks.c b/daemons/based/based_callbacks.c
|
||||
index 5f3dc62..f16e4d9 100644
|
||||
--- a/daemons/based/based_callbacks.c
|
||||
+++ b/daemons/based/based_callbacks.c
|
||||
@@ -1362,7 +1362,7 @@ cib_process_command(xmlNode *request, const cib__operation_t *operation,
|
||||
input = prepare_input(request, operation->type, §ion);
|
||||
|
||||
if (!pcmk_is_set(operation->flags, cib__op_attr_modifies)) {
|
||||
- rc = cib_perform_op(op, call_options, op_function, true, section,
|
||||
+ rc = cib_perform_op(NULL, op, call_options, op_function, true, section,
|
||||
request, input, false, &config_changed, &the_cib,
|
||||
&result_cib, NULL, &output);
|
||||
|
||||
@@ -1395,7 +1395,7 @@ cib_process_command(xmlNode *request, const cib__operation_t *operation,
|
||||
}
|
||||
|
||||
// result_cib must not be modified after cib_perform_op() returns
|
||||
- rc = cib_perform_op(op, call_options, op_function, false, section,
|
||||
+ rc = cib_perform_op(NULL, op, call_options, op_function, false, section,
|
||||
request, input, manage_counters, &config_changed,
|
||||
&the_cib, &result_cib, cib_diff, &output);
|
||||
|
||||
diff --git a/include/crm/cib/internal.h b/include/crm/cib/internal.h
|
||||
index 9d54d52..b6d6871 100644
|
||||
--- a/include/crm/cib/internal.h
|
||||
+++ b/include/crm/cib/internal.h
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright 2004-2023 the Pacemaker project contributors
|
||||
+ * Copyright 2004-2024 the Pacemaker project contributors
|
||||
*
|
||||
* The version control history for this file may have further details.
|
||||
*
|
||||
@@ -206,7 +206,7 @@ int cib__get_notify_patchset(const xmlNode *msg, const xmlNode **patchset);
|
||||
|
||||
bool cib__element_in_patchset(const xmlNode *patchset, const char *element);
|
||||
|
||||
-int cib_perform_op(const char *op, int call_options, cib__op_fn_t fn,
|
||||
+int cib_perform_op(cib_t *cib, const char *op, int call_options, cib__op_fn_t fn,
|
||||
bool is_query, const char *section, xmlNode *req,
|
||||
xmlNode *input, bool manage_counters, bool *config_changed,
|
||||
xmlNode **current_cib, xmlNode **result_cib, xmlNode **diff,
|
||||
diff --git a/lib/cib/cib_file.c b/lib/cib/cib_file.c
|
||||
index a279823..9dd952c 100644
|
||||
--- a/lib/cib/cib_file.c
|
||||
+++ b/lib/cib/cib_file.c
|
||||
@@ -245,7 +245,7 @@ cib_file_process_request(cib_t *cib, xmlNode *request, xmlNode **output)
|
||||
data = pcmk_find_cib_element(data, section);
|
||||
}
|
||||
|
||||
- rc = cib_perform_op(op, call_options, op_function, read_only, section,
|
||||
+ rc = cib_perform_op(cib, op, call_options, op_function, read_only, section,
|
||||
request, data, true, &changed, &private->cib_xml,
|
||||
&result_cib, &cib_diff, output);
|
||||
|
||||
diff --git a/lib/cib/cib_utils.c b/lib/cib/cib_utils.c
|
||||
index bf2982c..9c3f9f1 100644
|
||||
--- a/lib/cib/cib_utils.c
|
||||
+++ b/lib/cib/cib_utils.c
|
||||
@@ -339,11 +339,10 @@ should_copy_cib(const char *op, const char *section, int call_options)
|
||||
}
|
||||
|
||||
int
|
||||
-cib_perform_op(const char *op, int call_options, cib__op_fn_t fn, bool is_query,
|
||||
- const char *section, xmlNode *req, xmlNode *input,
|
||||
- bool manage_counters, bool *config_changed,
|
||||
- xmlNode **current_cib, xmlNode **result_cib, xmlNode **diff,
|
||||
- xmlNode **output)
|
||||
+cib_perform_op(cib_t *cib, const char *op, int call_options, cib__op_fn_t fn,
|
||||
+ bool is_query, const char *section, xmlNode *req, xmlNode *input,
|
||||
+ bool manage_counters, bool *config_changed, xmlNode **current_cib,
|
||||
+ xmlNode **result_cib, xmlNode **diff, xmlNode **output)
|
||||
{
|
||||
int rc = pcmk_ok;
|
||||
bool check_schema = true;
|
||||
@@ -468,7 +467,11 @@ cib_perform_op(const char *op, int call_options, cib__op_fn_t fn, bool is_query,
|
||||
goto done;
|
||||
}
|
||||
|
||||
- if (scratch) {
|
||||
+ /* If the CIB is from a file, we don't need to check that the feature set is
|
||||
+ * supported. All we care about in that case is the schema version, which
|
||||
+ * is checked elsewhere.
|
||||
+ */
|
||||
+ if (scratch && (cib == NULL || cib->variant != cib_file)) {
|
||||
const char *new_version = crm_element_value(scratch, XML_ATTR_CRM_VERSION);
|
||||
|
||||
rc = pcmk__check_feature_set(new_version);
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -1,143 +0,0 @@
|
|||
From b52fe799c89637e2a761a5725c2376db5c05f2d1 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 30 Nov 2021 15:51:54 -0600
|
||||
Subject: [PATCH 1/2] Low: resources: remove DOCTYPE from OCF 1.1-compliant
|
||||
agents
|
||||
|
||||
OCF 1.1 replaced the DTD schema with RNG, but DOCTYPE still refers to the DTD.
|
||||
There's no DOCTYPE for RNG, and DOCTYPE is optional, so just remove it.
|
||||
---
|
||||
extra/resources/Dummy | 3 +--
|
||||
extra/resources/HealthIOWait | 3 +--
|
||||
extra/resources/Stateful | 3 +--
|
||||
extra/resources/attribute | 3 +--
|
||||
extra/resources/ping | 3 +--
|
||||
extra/resources/remote | 3 +--
|
||||
6 files changed, 6 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/extra/resources/Dummy b/extra/resources/Dummy
|
||||
index a344deac0..56584e564 100755
|
||||
--- a/extra/resources/Dummy
|
||||
+++ b/extra/resources/Dummy
|
||||
@@ -58,8 +58,7 @@
|
||||
meta_data() {
|
||||
cat <<END
|
||||
<?xml version="1.0"?>
|
||||
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
|
||||
-<resource-agent name="Dummy" version="2.0">
|
||||
+<resource-agent name="Dummy" version="2.1">
|
||||
<version>1.1</version>
|
||||
|
||||
<longdesc lang="en">
|
||||
diff --git a/extra/resources/HealthIOWait b/extra/resources/HealthIOWait
|
||||
index 43a8b70c4..5f1483ef7 100755
|
||||
--- a/extra/resources/HealthIOWait
|
||||
+++ b/extra/resources/HealthIOWait
|
||||
@@ -25,8 +25,7 @@
|
||||
meta_data() {
|
||||
cat <<END
|
||||
<?xml version="1.0"?>
|
||||
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
|
||||
-<resource-agent name="HealthIOWait" version="1.1">
|
||||
+<resource-agent name="HealthIOWait" version="1.2">
|
||||
<version>1.1</version>
|
||||
|
||||
<longdesc lang="en">
|
||||
diff --git a/extra/resources/Stateful b/extra/resources/Stateful
|
||||
index ae3424bbf..0d2062d51 100755
|
||||
--- a/extra/resources/Stateful
|
||||
+++ b/extra/resources/Stateful
|
||||
@@ -39,8 +39,7 @@ SCORE_PROMOTED=10
|
||||
meta_data() {
|
||||
cat <<END
|
||||
<?xml version="1.0"?>
|
||||
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
|
||||
-<resource-agent name="Stateful" version="1.1">
|
||||
+<resource-agent name="Stateful" version="1.2">
|
||||
<version>1.1</version>
|
||||
|
||||
<longdesc lang="en">
|
||||
diff --git a/extra/resources/attribute b/extra/resources/attribute
|
||||
index 1800dff8f..a2bd353e0 100755
|
||||
--- a/extra/resources/attribute
|
||||
+++ b/extra/resources/attribute
|
||||
@@ -57,8 +57,7 @@ END
|
||||
meta_data() {
|
||||
cat <<END
|
||||
<?xml version="1.0"?>
|
||||
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
|
||||
-<resource-agent name="attribute" version="1.1">
|
||||
+<resource-agent name="attribute" version="1.2">
|
||||
<version>1.1</version>
|
||||
<shortdesc lang="en">Manages a node attribute</shortdesc>
|
||||
<longdesc lang="en">
|
||||
diff --git a/extra/resources/ping b/extra/resources/ping
|
||||
index 6e296979f..7cc6b802d 100755
|
||||
--- a/extra/resources/ping
|
||||
+++ b/extra/resources/ping
|
||||
@@ -36,8 +36,7 @@
|
||||
meta_data() {
|
||||
cat <<END
|
||||
<?xml version="1.0"?>
|
||||
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
|
||||
-<resource-agent name="ping" version="1.1">
|
||||
+<resource-agent name="ping" version="1.2">
|
||||
<version>1.1</version>
|
||||
|
||||
<longdesc lang="en">
|
||||
diff --git a/extra/resources/remote b/extra/resources/remote
|
||||
index a53262bb6..f7e40dc81 100755
|
||||
--- a/extra/resources/remote
|
||||
+++ b/extra/resources/remote
|
||||
@@ -24,8 +24,7 @@
|
||||
meta_data() {
|
||||
cat <<END
|
||||
<?xml version="1.0"?>
|
||||
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
|
||||
-<resource-agent name="remote" version="1.0">
|
||||
+<resource-agent name="remote" version="1.1">
|
||||
<version>1.1</version>
|
||||
<shortdesc lang="en">Pacemaker Remote connection</shortdesc>
|
||||
<parameters>
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 70f469120f8db6a024c786466ee74a6c7fbd1f43 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 30 Nov 2021 15:53:39 -0600
|
||||
Subject: [PATCH 2/2] Fix: resources: use correct syntax in Stateful meta-data
|
||||
|
||||
The OCF standard only allows "0" or "1" for booleans.
|
||||
|
||||
This fixes incorrect ocf:pacemaker:Stateful meta-data syntax introduced by
|
||||
7024398 as a regression in the 2.1.0 release.
|
||||
---
|
||||
extra/resources/Stateful | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/extra/resources/Stateful b/extra/resources/Stateful
|
||||
index 0d2062d51..2ebe6725f 100755
|
||||
--- a/extra/resources/Stateful
|
||||
+++ b/extra/resources/Stateful
|
||||
@@ -57,7 +57,7 @@ Location to store the resource state in
|
||||
<content type="string" default="${HA_VARRUN%%/}/Stateful-${OCF_RESOURCE_INSTANCE}.state" />
|
||||
</parameter>
|
||||
|
||||
-<parameter name="envfile" reloadable="true">
|
||||
+<parameter name="envfile" reloadable="1">
|
||||
<longdesc lang="en">
|
||||
If this is set, the environment will be dumped to this file for every call.
|
||||
</longdesc>
|
||||
@@ -65,7 +65,7 @@ If this is set, the environment will be dumped to this file for every call.
|
||||
<content type="string" default="" />
|
||||
</parameter>
|
||||
|
||||
-<parameter name="notify_delay" reloadable="true">
|
||||
+<parameter name="notify_delay" reloadable="1">
|
||||
<longdesc lang="en">
|
||||
The notify action will sleep for this many seconds before returning,
|
||||
to simulate a long-running notify.
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
From f491d9d5a7ed554fed985de356bb085fdec3421c Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 7 Dec 2021 09:01:00 -0600
|
||||
Subject: [PATCH] Fix: fencer: avoid memory leak when broadcasting history
|
||||
differences
|
||||
|
||||
Regression introduced in 2.1.0 by dbc27b2
|
||||
---
|
||||
daemons/fenced/fenced_history.c | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/daemons/fenced/fenced_history.c b/daemons/fenced/fenced_history.c
|
||||
index bc159383c..a9c57dc86 100644
|
||||
--- a/daemons/fenced/fenced_history.c
|
||||
+++ b/daemons/fenced/fenced_history.c
|
||||
@@ -484,8 +484,6 @@ stonith_fence_history(xmlNode *msg, xmlNode **output,
|
||||
!pcmk__str_eq(remote_peer, stonith_our_uname, pcmk__str_casei)) {
|
||||
xmlNode *history = get_xpath_object("//" F_STONITH_HISTORY_LIST,
|
||||
msg, LOG_NEVER);
|
||||
- GHashTable *received_history =
|
||||
- history?stonith_xml_history_to_list(history):NULL;
|
||||
|
||||
/* either a broadcast created directly upon stonith-API request
|
||||
* or a diff as response to such a thing
|
||||
@@ -497,6 +495,11 @@ stonith_fence_history(xmlNode *msg, xmlNode **output,
|
||||
if (!history ||
|
||||
!crm_is_true(crm_element_value(history,
|
||||
F_STONITH_DIFFERENTIAL))) {
|
||||
+ GHashTable *received_history = NULL;
|
||||
+
|
||||
+ if (history != NULL) {
|
||||
+ received_history = stonith_xml_history_to_list(history);
|
||||
+ }
|
||||
out_history =
|
||||
stonith_local_history_diff_and_merge(received_history, TRUE, NULL);
|
||||
if (out_history) {
|
||||
--
|
||||
2.27.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,373 @@
|
|||
From 4823643bef8801b33688167b159bb531bcdf8911 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Thu, 4 Jan 2024 17:10:08 -0600
|
||||
Subject: [PATCH 1/5] Refactor: pacemaker-attrd: drop redundant argument from
|
||||
update_attr_on_host()
|
||||
|
||||
It can check for a force-write via its xml argument, to simplify the caller
|
||||
---
|
||||
daemons/attrd/attrd_corosync.c | 13 +++++++------
|
||||
1 file changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/daemons/attrd/attrd_corosync.c b/daemons/attrd/attrd_corosync.c
|
||||
index 158d82f..1b56923 100644
|
||||
--- a/daemons/attrd/attrd_corosync.c
|
||||
+++ b/daemons/attrd/attrd_corosync.c
|
||||
@@ -266,7 +266,7 @@ record_peer_nodeid(attribute_value_t *v, const char *host)
|
||||
static void
|
||||
update_attr_on_host(attribute_t *a, const crm_node_t *peer, const xmlNode *xml,
|
||||
const char *attr, const char *value, const char *host,
|
||||
- bool filter, int is_force_write)
|
||||
+ bool filter)
|
||||
{
|
||||
attribute_value_t *v = NULL;
|
||||
|
||||
@@ -309,6 +309,10 @@ update_attr_on_host(attribute_t *a, const crm_node_t *peer, const xmlNode *xml,
|
||||
}
|
||||
|
||||
} else {
|
||||
+ int is_force_write = 0;
|
||||
+
|
||||
+ crm_element_value_int(xml, PCMK__XA_ATTR_FORCE, &is_force_write);
|
||||
+
|
||||
if (is_force_write == 1 && a->timeout_ms && a->timer) {
|
||||
/* Save forced writing and set change flag. */
|
||||
/* The actual attribute is written by Writer after election. */
|
||||
@@ -338,15 +342,12 @@ attrd_peer_update_one(const crm_node_t *peer, xmlNode *xml, bool filter)
|
||||
const char *attr = crm_element_value(xml, PCMK__XA_ATTR_NAME);
|
||||
const char *value = crm_element_value(xml, PCMK__XA_ATTR_VALUE);
|
||||
const char *host = crm_element_value(xml, PCMK__XA_ATTR_NODE_NAME);
|
||||
- int is_force_write = 0;
|
||||
|
||||
if (attr == NULL) {
|
||||
crm_warn("Could not update attribute: peer did not specify name");
|
||||
return;
|
||||
}
|
||||
|
||||
- crm_element_value_int(xml, PCMK__XA_ATTR_FORCE, &is_force_write);
|
||||
-
|
||||
a = attrd_populate_attribute(xml, attr);
|
||||
if (a == NULL) {
|
||||
return;
|
||||
@@ -361,12 +362,12 @@ attrd_peer_update_one(const crm_node_t *peer, xmlNode *xml, bool filter)
|
||||
g_hash_table_iter_init(&vIter, a->values);
|
||||
|
||||
while (g_hash_table_iter_next(&vIter, (gpointer *) & host, NULL)) {
|
||||
- update_attr_on_host(a, peer, xml, attr, value, host, filter, is_force_write);
|
||||
+ update_attr_on_host(a, peer, xml, attr, value, host, filter);
|
||||
}
|
||||
|
||||
} else {
|
||||
// Update attribute value for the given host
|
||||
- update_attr_on_host(a, peer, xml, attr, value, host, filter, is_force_write);
|
||||
+ update_attr_on_host(a, peer, xml, attr, value, host, filter);
|
||||
}
|
||||
|
||||
/* If this is a message from some attrd instance broadcasting its protocol
|
||||
--
|
||||
2.31.1
|
||||
|
||||
From c7a1ab819b25e3225c185c1630a7139a96fb5c71 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 9 Jan 2024 16:48:37 -0600
|
||||
Subject: [PATCH 2/5] Refactor: pacemaker-attrd: drop unused argument from
|
||||
attrd_peer_sync()
|
||||
|
||||
---
|
||||
daemons/attrd/attrd_corosync.c | 10 ++++++++--
|
||||
daemons/attrd/attrd_elections.c | 2 +-
|
||||
daemons/attrd/attrd_messages.c | 2 +-
|
||||
daemons/attrd/pacemaker-attrd.h | 2 +-
|
||||
4 files changed, 11 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/daemons/attrd/attrd_corosync.c b/daemons/attrd/attrd_corosync.c
|
||||
index 1b56923..088f00c 100644
|
||||
--- a/daemons/attrd/attrd_corosync.c
|
||||
+++ b/daemons/attrd/attrd_corosync.c
|
||||
@@ -233,7 +233,7 @@ attrd_peer_change_cb(enum crm_status_type kind, crm_node_t *peer, const void *da
|
||||
*/
|
||||
if (attrd_election_won()
|
||||
&& !pcmk_is_set(peer->flags, crm_remote_node)) {
|
||||
- attrd_peer_sync(peer, NULL);
|
||||
+ attrd_peer_sync(peer);
|
||||
}
|
||||
} else {
|
||||
// Remove all attribute values associated with lost nodes
|
||||
@@ -535,8 +535,14 @@ attrd_peer_remove(const char *host, bool uncache, const char *source)
|
||||
}
|
||||
}
|
||||
|
||||
+/*!
|
||||
+ * \internal
|
||||
+ * \brief Send all known attributes and values to a peer
|
||||
+ *
|
||||
+ * \param[in] peer Peer to send sync to (if NULL, broadcast to all peers)
|
||||
+ */
|
||||
void
|
||||
-attrd_peer_sync(crm_node_t *peer, xmlNode *xml)
|
||||
+attrd_peer_sync(crm_node_t *peer)
|
||||
{
|
||||
GHashTableIter aIter;
|
||||
GHashTableIter vIter;
|
||||
diff --git a/daemons/attrd/attrd_elections.c b/daemons/attrd/attrd_elections.c
|
||||
index 82fbe8a..9dbf133 100644
|
||||
--- a/daemons/attrd/attrd_elections.c
|
||||
+++ b/daemons/attrd/attrd_elections.c
|
||||
@@ -23,7 +23,7 @@ attrd_election_cb(gpointer user_data)
|
||||
attrd_declare_winner();
|
||||
|
||||
/* Update the peers after an election */
|
||||
- attrd_peer_sync(NULL, NULL);
|
||||
+ attrd_peer_sync(NULL);
|
||||
|
||||
/* After winning an election, update the CIB with the values of all
|
||||
* attributes as the winner knows them.
|
||||
diff --git a/daemons/attrd/attrd_messages.c b/daemons/attrd/attrd_messages.c
|
||||
index 5525d4b..13ac01f 100644
|
||||
--- a/daemons/attrd/attrd_messages.c
|
||||
+++ b/daemons/attrd/attrd_messages.c
|
||||
@@ -180,7 +180,7 @@ handle_sync_request(pcmk__request_t *request)
|
||||
crm_node_t *peer = pcmk__get_node(0, request->peer, NULL,
|
||||
pcmk__node_search_cluster);
|
||||
|
||||
- attrd_peer_sync(peer, request->xml);
|
||||
+ attrd_peer_sync(peer);
|
||||
pcmk__set_result(&request->result, CRM_EX_OK, PCMK_EXEC_DONE, NULL);
|
||||
return NULL;
|
||||
} else {
|
||||
diff --git a/daemons/attrd/pacemaker-attrd.h b/daemons/attrd/pacemaker-attrd.h
|
||||
index 7384188..bacaad6 100644
|
||||
--- a/daemons/attrd/pacemaker-attrd.h
|
||||
+++ b/daemons/attrd/pacemaker-attrd.h
|
||||
@@ -175,7 +175,7 @@ extern GHashTable *peer_protocol_vers;
|
||||
int attrd_cluster_connect(void);
|
||||
void attrd_peer_update(const crm_node_t *peer, xmlNode *xml, const char *host,
|
||||
bool filter);
|
||||
-void attrd_peer_sync(crm_node_t *peer, xmlNode *xml);
|
||||
+void attrd_peer_sync(crm_node_t *peer);
|
||||
void attrd_peer_remove(const char *host, bool uncache, const char *source);
|
||||
void attrd_peer_clear_failure(pcmk__request_t *request);
|
||||
void attrd_peer_sync_response(const crm_node_t *peer, bool peer_won,
|
||||
--
|
||||
2.31.1
|
||||
|
||||
From abafae0068e10abb135b0496086947728365299a Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Thu, 11 Jan 2024 17:31:17 -0600
|
||||
Subject: [PATCH 3/5] Refactor: pacemaker-attrd: de-functionize
|
||||
attrd_lookup_or_create_value()
|
||||
|
||||
... to make planned changes easier
|
||||
---
|
||||
daemons/attrd/attrd_corosync.c | 62 +++++++++++++---------------------
|
||||
1 file changed, 24 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/daemons/attrd/attrd_corosync.c b/daemons/attrd/attrd_corosync.c
|
||||
index 088f00c..59e6a26 100644
|
||||
--- a/daemons/attrd/attrd_corosync.c
|
||||
+++ b/daemons/attrd/attrd_corosync.c
|
||||
@@ -168,40 +168,6 @@ broadcast_local_value(const attribute_t *a)
|
||||
|
||||
#define state_text(state) pcmk__s((state), "in unknown state")
|
||||
|
||||
-/*!
|
||||
- * \internal
|
||||
- * \brief Return a node's value from hash table (creating one if needed)
|
||||
- *
|
||||
- * \param[in,out] values Hash table of values
|
||||
- * \param[in] node_name Name of node to look up
|
||||
- * \param[in] xml XML describing the attribute
|
||||
- *
|
||||
- * \return Pointer to new or existing hash table entry
|
||||
- */
|
||||
-static attribute_value_t *
|
||||
-attrd_lookup_or_create_value(GHashTable *values, const char *node_name,
|
||||
- const xmlNode *xml)
|
||||
-{
|
||||
- attribute_value_t *v = g_hash_table_lookup(values, node_name);
|
||||
- int is_remote = 0;
|
||||
-
|
||||
- if (v == NULL) {
|
||||
- v = calloc(1, sizeof(attribute_value_t));
|
||||
- CRM_ASSERT(v != NULL);
|
||||
-
|
||||
- pcmk__str_update(&v->nodename, node_name);
|
||||
- g_hash_table_replace(values, v->nodename, v);
|
||||
- }
|
||||
-
|
||||
- crm_element_value_int(xml, PCMK__XA_ATTR_IS_REMOTE, &is_remote);
|
||||
- if (is_remote) {
|
||||
- attrd_set_value_flags(v, attrd_value_remote);
|
||||
- CRM_ASSERT(crm_remote_peer_get(node_name) != NULL);
|
||||
- }
|
||||
-
|
||||
- return(v);
|
||||
-}
|
||||
-
|
||||
static void
|
||||
attrd_peer_change_cb(enum crm_status_type kind, crm_node_t *peer, const void *data)
|
||||
{
|
||||
@@ -268,18 +234,38 @@ update_attr_on_host(attribute_t *a, const crm_node_t *peer, const xmlNode *xml,
|
||||
const char *attr, const char *value, const char *host,
|
||||
bool filter)
|
||||
{
|
||||
+ int is_remote = 0;
|
||||
+ bool changed = false;
|
||||
attribute_value_t *v = NULL;
|
||||
|
||||
- v = attrd_lookup_or_create_value(a->values, host, xml);
|
||||
+ // Create entry for value if not already existing
|
||||
+ v = g_hash_table_lookup(a->values, host);
|
||||
+ if (v == NULL) {
|
||||
+ v = calloc(1, sizeof(attribute_value_t));
|
||||
+ CRM_ASSERT(v != NULL);
|
||||
+
|
||||
+ pcmk__str_update(&v->nodename, host);
|
||||
+ g_hash_table_replace(a->values, v->nodename, v);
|
||||
+ }
|
||||
+
|
||||
+ // If value is for a Pacemaker Remote node, remember that
|
||||
+ crm_element_value_int(xml, PCMK__XA_ATTR_IS_REMOTE, &is_remote);
|
||||
+ if (is_remote) {
|
||||
+ attrd_set_value_flags(v, attrd_value_remote);
|
||||
+ CRM_ASSERT(crm_remote_peer_get(host) != NULL);
|
||||
+ }
|
||||
+
|
||||
+ // Check whether the value changed
|
||||
+ changed = !pcmk__str_eq(v->current, value, pcmk__str_casei);
|
||||
|
||||
- if (filter && !pcmk__str_eq(v->current, value, pcmk__str_casei)
|
||||
- && pcmk__str_eq(host, attrd_cluster->uname, pcmk__str_casei)) {
|
||||
+ if (changed && filter && pcmk__str_eq(host, attrd_cluster->uname,
|
||||
+ pcmk__str_casei)) {
|
||||
|
||||
crm_notice("%s[%s]: local value '%s' takes priority over '%s' from %s",
|
||||
attr, host, v->current, value, peer->uname);
|
||||
v = broadcast_local_value(a);
|
||||
|
||||
- } else if (!pcmk__str_eq(v->current, value, pcmk__str_casei)) {
|
||||
+ } else if (changed) {
|
||||
crm_notice("Setting %s[%s]%s%s: %s -> %s "
|
||||
CRM_XS " from %s with %s write delay",
|
||||
attr, host, a->set_type ? " in " : "",
|
||||
--
|
||||
2.31.1
|
||||
|
||||
From 72529ec512fb4938bd8dbbd2caf44bbb1a616826 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Thu, 11 Jan 2024 18:04:33 -0600
|
||||
Subject: [PATCH 4/5] Refactor: pacemaker-attrd: minor shuffling to make
|
||||
planned changes easier
|
||||
|
||||
---
|
||||
daemons/attrd/attrd_cib.c | 19 +++++++++++--------
|
||||
1 file changed, 11 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/daemons/attrd/attrd_cib.c b/daemons/attrd/attrd_cib.c
|
||||
index bdc0a10..481fea7 100644
|
||||
--- a/daemons/attrd/attrd_cib.c
|
||||
+++ b/daemons/attrd/attrd_cib.c
|
||||
@@ -51,6 +51,7 @@ attrd_cib_updated_cb(const char *event, xmlNode *msg)
|
||||
{
|
||||
const xmlNode *patchset = NULL;
|
||||
const char *client_name = NULL;
|
||||
+ bool status_changed = false;
|
||||
|
||||
if (attrd_shutting_down(true)) {
|
||||
return;
|
||||
@@ -64,20 +65,22 @@ attrd_cib_updated_cb(const char *event, xmlNode *msg)
|
||||
mainloop_set_trigger(attrd_config_read);
|
||||
}
|
||||
|
||||
- if (!attrd_election_won()) {
|
||||
- // Don't write attributes if we're not the writer
|
||||
- return;
|
||||
- }
|
||||
+ status_changed = cib__element_in_patchset(patchset, XML_CIB_TAG_STATUS);
|
||||
|
||||
client_name = crm_element_value(msg, F_CIB_CLIENTNAME);
|
||||
if (!cib__client_triggers_refresh(client_name)) {
|
||||
- // The CIB is still accurate
|
||||
+ /* This change came from a source that ensured the CIB is consistent
|
||||
+ * with our attributes table, so we don't need to write anything out.
|
||||
+ */
|
||||
return;
|
||||
}
|
||||
|
||||
- if (cib__element_in_patchset(patchset, XML_CIB_TAG_NODES)
|
||||
- || cib__element_in_patchset(patchset, XML_CIB_TAG_STATUS)) {
|
||||
-
|
||||
+ if (!attrd_election_won()) {
|
||||
+ // Don't write attributes if we're not the writer
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (status_changed || cib__element_in_patchset(patchset, XML_CIB_TAG_NODES)) {
|
||||
/* An unsafe client modified the nodes or status section. Write
|
||||
* transient attributes to ensure they're up-to-date in the CIB.
|
||||
*/
|
||||
--
|
||||
2.31.1
|
||||
|
||||
From b83c2567fb450eec5b18882ded16403831d2c3c0 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Thu, 11 Jan 2024 17:53:55 -0600
|
||||
Subject: [PATCH 5/5] Log: pacemaker-attrd: make sure we don't try to log NULL
|
||||
|
||||
---
|
||||
daemons/attrd/attrd_corosync.c | 15 +++++++++++----
|
||||
1 file changed, 11 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/daemons/attrd/attrd_corosync.c b/daemons/attrd/attrd_corosync.c
|
||||
index 59e6a26..b348d52 100644
|
||||
--- a/daemons/attrd/attrd_corosync.c
|
||||
+++ b/daemons/attrd/attrd_corosync.c
|
||||
@@ -229,6 +229,11 @@ record_peer_nodeid(attribute_value_t *v, const char *host)
|
||||
}
|
||||
}
|
||||
|
||||
+#define readable_value(rv_v) pcmk__s((rv_v)->current, "(unset)")
|
||||
+
|
||||
+#define readable_peer(p) \
|
||||
+ (((p) == NULL)? "all peers" : pcmk__s((p)->uname, "unknown peer"))
|
||||
+
|
||||
static void
|
||||
update_attr_on_host(attribute_t *a, const crm_node_t *peer, const xmlNode *xml,
|
||||
const char *attr, const char *value, const char *host,
|
||||
@@ -262,14 +267,14 @@ update_attr_on_host(attribute_t *a, const crm_node_t *peer, const xmlNode *xml,
|
||||
pcmk__str_casei)) {
|
||||
|
||||
crm_notice("%s[%s]: local value '%s' takes priority over '%s' from %s",
|
||||
- attr, host, v->current, value, peer->uname);
|
||||
+ attr, host, readable_value(v), value, peer->uname);
|
||||
v = broadcast_local_value(a);
|
||||
|
||||
} else if (changed) {
|
||||
crm_notice("Setting %s[%s]%s%s: %s -> %s "
|
||||
CRM_XS " from %s with %s write delay",
|
||||
attr, host, a->set_type ? " in " : "",
|
||||
- pcmk__s(a->set_type, ""), pcmk__s(v->current, "(unset)"),
|
||||
+ pcmk__s(a->set_type, ""), readable_value(v),
|
||||
pcmk__s(value, "(unset)"), peer->uname,
|
||||
(a->timeout_ms == 0)? "no" : pcmk__readable_interval(a->timeout_ms));
|
||||
pcmk__str_update(&v->current, value);
|
||||
@@ -543,12 +548,14 @@ attrd_peer_sync(crm_node_t *peer)
|
||||
while (g_hash_table_iter_next(&aIter, NULL, (gpointer *) & a)) {
|
||||
g_hash_table_iter_init(&vIter, a->values);
|
||||
while (g_hash_table_iter_next(&vIter, NULL, (gpointer *) & v)) {
|
||||
- crm_debug("Syncing %s[%s] = %s to %s", a->id, v->nodename, v->current, peer?peer->uname:"everyone");
|
||||
+ crm_debug("Syncing %s[%s]='%s' to %s",
|
||||
+ a->id, v->nodename, readable_value(v),
|
||||
+ readable_peer(peer));
|
||||
attrd_add_value_xml(sync, a, v, false);
|
||||
}
|
||||
}
|
||||
|
||||
- crm_debug("Syncing values to %s", peer?peer->uname:"everyone");
|
||||
+ crm_debug("Syncing values to %s", readable_peer(peer));
|
||||
attrd_send_message(peer, sync, false);
|
||||
free_xml(sync);
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
From 0339e89f3238b31df78b864dae8684b82c370741 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Mon, 13 Dec 2021 15:22:40 -0600
|
||||
Subject: [PATCH] Fix: fencer: get current time correctly
|
||||
|
||||
f52bc8e1ce (2.1.2) introduced a regression by using clock_gettime() with
|
||||
CLOCK_MONOTONIC to get the current time. Use qb_util_timespec_from_epoch_get()
|
||||
instead (which as of this writing uses clock_gettime() with CLOCK_REALTIME if
|
||||
available, and falls back to gettimeofday() if not).
|
||||
---
|
||||
daemons/fenced/fenced_commands.c | 11 +++--------
|
||||
1 file changed, 3 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/daemons/fenced/fenced_commands.c b/daemons/fenced/fenced_commands.c
|
||||
index f34cb4f13..7685cb8c3 100644
|
||||
--- a/daemons/fenced/fenced_commands.c
|
||||
+++ b/daemons/fenced/fenced_commands.c
|
||||
@@ -2746,19 +2746,14 @@ bool fencing_peer_active(crm_node_t *peer)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
-void set_fencing_completed(remote_fencing_op_t * op)
|
||||
+void
|
||||
+set_fencing_completed(remote_fencing_op_t *op)
|
||||
{
|
||||
-#ifdef CLOCK_MONOTONIC
|
||||
struct timespec tv;
|
||||
|
||||
- clock_gettime(CLOCK_MONOTONIC, &tv);
|
||||
-
|
||||
+ qb_util_timespec_from_epoch_get(&tv);
|
||||
op->completed = tv.tv_sec;
|
||||
op->completed_nsec = tv.tv_nsec;
|
||||
-#else
|
||||
- op->completed = time(NULL);
|
||||
- op->completed_nsec = 0L;
|
||||
-#endif
|
||||
}
|
||||
|
||||
/*!
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -0,0 +1,385 @@
|
|||
From 84d4a0d5f562df91baa0fece45d06ad3732f941c Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 16 Jan 2024 11:20:53 -0600
|
||||
Subject: [PATCH 1/5] Low: pacemaker-attrd: properly validate attribute set
|
||||
type
|
||||
|
||||
The sense of the test was accidentally reversed in 26471a52689
|
||||
---
|
||||
daemons/attrd/attrd_attributes.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/daemons/attrd/attrd_attributes.c b/daemons/attrd/attrd_attributes.c
|
||||
index 8f32988..f059059 100644
|
||||
--- a/daemons/attrd/attrd_attributes.c
|
||||
+++ b/daemons/attrd/attrd_attributes.c
|
||||
@@ -40,9 +40,9 @@ attrd_create_attribute(xmlNode *xml)
|
||||
* attributes are not written.
|
||||
*/
|
||||
crm_element_value_int(xml, PCMK__XA_ATTR_IS_PRIVATE, &is_private);
|
||||
- if ((is_private != 0)
|
||||
- && !pcmk__str_any_of(set_type, XML_TAG_ATTR_SETS, XML_TAG_UTILIZATION,
|
||||
- NULL)) {
|
||||
+ if (!is_private && !pcmk__str_any_of(set_type,
|
||||
+ XML_TAG_ATTR_SETS,
|
||||
+ XML_TAG_UTILIZATION, NULL)) {
|
||||
crm_warn("Ignoring attribute %s with invalid set type %s",
|
||||
pcmk__s(name, "(unidentified)"), set_type);
|
||||
return NULL;
|
||||
--
|
||||
2.31.1
|
||||
|
||||
From d0d0511e71fe983a2d89589c39810b79fb48a8ca Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 16 Jan 2024 12:13:42 -0600
|
||||
Subject: [PATCH 2/5] Fix: pacemaker-attrd: sync utilization attributes to
|
||||
peers correctly
|
||||
|
||||
Include the set type with attribute syncs.
|
||||
|
||||
Previously, utilization attributes would have the correct set_type on the node
|
||||
where they were set, but peers would store it as a regular node attribute. If
|
||||
one of those peers became writer, the attribute would get written to the wrong
|
||||
set.
|
||||
---
|
||||
daemons/attrd/attrd_attributes.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/daemons/attrd/attrd_attributes.c b/daemons/attrd/attrd_attributes.c
|
||||
index f059059..0ad9630 100644
|
||||
--- a/daemons/attrd/attrd_attributes.c
|
||||
+++ b/daemons/attrd/attrd_attributes.c
|
||||
@@ -139,6 +139,7 @@ attrd_add_value_xml(xmlNode *parent, const attribute_t *a,
|
||||
xmlNode *xml = create_xml_node(parent, __func__);
|
||||
|
||||
crm_xml_add(xml, PCMK__XA_ATTR_NAME, a->id);
|
||||
+ crm_xml_add(xml, PCMK__XA_ATTR_SET_TYPE, a->set_type);
|
||||
crm_xml_add(xml, PCMK__XA_ATTR_SET, a->set_id);
|
||||
crm_xml_add(xml, PCMK__XA_ATTR_UUID, a->uuid);
|
||||
crm_xml_add(xml, PCMK__XA_ATTR_USER, a->user);
|
||||
--
|
||||
2.31.1
|
||||
|
||||
From 4479ff8507dd69f5946d31cf83c7e47fe15d3bdb Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 16 Jan 2024 12:18:40 -0600
|
||||
Subject: [PATCH 3/5] Refactor: pacemaker-attrd: functionize getting attribute
|
||||
set ID
|
||||
|
||||
... for future reuse
|
||||
---
|
||||
daemons/attrd/attrd_attributes.c | 38 ++++++++++++++++++++++++++++++++
|
||||
daemons/attrd/attrd_cib.c | 9 +-------
|
||||
daemons/attrd/pacemaker-attrd.h | 3 ++-
|
||||
3 files changed, 41 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/daemons/attrd/attrd_attributes.c b/daemons/attrd/attrd_attributes.c
|
||||
index 0ad9630..5727ab8 100644
|
||||
--- a/daemons/attrd/attrd_attributes.c
|
||||
+++ b/daemons/attrd/attrd_attributes.c
|
||||
@@ -210,3 +210,41 @@ attrd_populate_attribute(xmlNode *xml, const char *attr)
|
||||
|
||||
return a;
|
||||
}
|
||||
+
|
||||
+/*!
|
||||
+ * \internal
|
||||
+ * \brief Get the XML ID used to write out an attribute set
|
||||
+ *
|
||||
+ * \param[in] attr Attribute to get set ID for
|
||||
+ * \param[in] node_state_id XML ID of node state that attribute value is for
|
||||
+ *
|
||||
+ * \return Newly allocated string with XML ID to use for \p attr set
|
||||
+ */
|
||||
+char *
|
||||
+attrd_set_id(const attribute_t *attr, const char *node_state_id)
|
||||
+{
|
||||
+ char *set_id = NULL;
|
||||
+
|
||||
+ CRM_ASSERT((attr != NULL) && (node_state_id != NULL));
|
||||
+
|
||||
+ if (attr->set_id == NULL) {
|
||||
+ /* @COMPAT This should really take the set type into account. Currently
|
||||
+ * we use the same XML ID for transient attributes and utilization
|
||||
+ * attributes. It doesn't cause problems because the status section is
|
||||
+ * not limited by the schema in any way, but it's still unfortunate.
|
||||
+ * For backward compatibility reasons, we can't change this.
|
||||
+ */
|
||||
+ set_id = crm_strdup_printf("%s-%s", XML_CIB_TAG_STATUS, node_state_id);
|
||||
+ } else {
|
||||
+ /* @COMPAT When the user specifies a set ID for an attribute, it is the
|
||||
+ * same for every node. That is less than ideal, but again, the schema
|
||||
+ * doesn't enforce anything for the status section. We couldn't change
|
||||
+ * it without allowing the set ID to vary per value rather than per
|
||||
+ * attribute, which would break backward compatibility, pose design
|
||||
+ * challenges, and potentially cause problems in rolling upgrades.
|
||||
+ */
|
||||
+ pcmk__str_update(&set_id, attr->set_id);
|
||||
+ }
|
||||
+ crm_xml_sanitize_id(set_id);
|
||||
+ return set_id;
|
||||
+}
|
||||
diff --git a/daemons/attrd/attrd_cib.c b/daemons/attrd/attrd_cib.c
|
||||
index 481fea7..08d3425 100644
|
||||
--- a/daemons/attrd/attrd_cib.c
|
||||
+++ b/daemons/attrd/attrd_cib.c
|
||||
@@ -423,17 +423,10 @@ add_unset_attr_update(const attribute_t *attr, const char *attr_id,
|
||||
static int
|
||||
add_attr_update(const attribute_t *attr, const char *value, const char *node_id)
|
||||
{
|
||||
- char *set_id = NULL;
|
||||
+ char *set_id = attrd_set_id(attr, node_id);
|
||||
char *attr_id = NULL;
|
||||
int rc = pcmk_rc_ok;
|
||||
|
||||
- if (attr->set_id != NULL) {
|
||||
- pcmk__str_update(&set_id, attr->set_id);
|
||||
- } else {
|
||||
- set_id = crm_strdup_printf("%s-%s", XML_CIB_TAG_STATUS, node_id);
|
||||
- }
|
||||
- crm_xml_sanitize_id(set_id);
|
||||
-
|
||||
if (attr->uuid != NULL) {
|
||||
pcmk__str_update(&attr_id, attr->uuid);
|
||||
} else {
|
||||
diff --git a/daemons/attrd/pacemaker-attrd.h b/daemons/attrd/pacemaker-attrd.h
|
||||
index bacaad6..3da7f8d 100644
|
||||
--- a/daemons/attrd/pacemaker-attrd.h
|
||||
+++ b/daemons/attrd/pacemaker-attrd.h
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright 2013-2023 the Pacemaker project contributors
|
||||
+ * Copyright 2013-2024 the Pacemaker project contributors
|
||||
*
|
||||
* The version control history for this file may have further details.
|
||||
*
|
||||
@@ -195,6 +195,7 @@ void attrd_clear_value_seen(void);
|
||||
void attrd_free_attribute(gpointer data);
|
||||
void attrd_free_attribute_value(gpointer data);
|
||||
attribute_t *attrd_populate_attribute(xmlNode *xml, const char *attr);
|
||||
+char *attrd_set_id(const attribute_t *attr, const char *node_state_id);
|
||||
|
||||
enum attrd_write_options {
|
||||
attrd_write_changed = 0,
|
||||
--
|
||||
2.31.1
|
||||
|
||||
From eee2169ac348b8ed26ac0b78cb11ddc5cef9384e Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 16 Jan 2024 12:25:59 -0600
|
||||
Subject: [PATCH 4/5] Refactor: pacemaker-attrd: functionize getting attribute
|
||||
nvpair ID
|
||||
|
||||
... for future reuse
|
||||
---
|
||||
daemons/attrd/attrd_attributes.c | 28 ++++++++++++++++++++++++++++
|
||||
daemons/attrd/attrd_cib.c | 17 +++++------------
|
||||
daemons/attrd/pacemaker-attrd.h | 1 +
|
||||
3 files changed, 34 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/daemons/attrd/attrd_attributes.c b/daemons/attrd/attrd_attributes.c
|
||||
index 5727ab8..23de2e2 100644
|
||||
--- a/daemons/attrd/attrd_attributes.c
|
||||
+++ b/daemons/attrd/attrd_attributes.c
|
||||
@@ -248,3 +248,31 @@ attrd_set_id(const attribute_t *attr, const char *node_state_id)
|
||||
crm_xml_sanitize_id(set_id);
|
||||
return set_id;
|
||||
}
|
||||
+
|
||||
+/*!
|
||||
+ * \internal
|
||||
+ * \brief Get the XML ID used to write out an attribute value
|
||||
+ *
|
||||
+ * \param[in] attr Attribute to get value XML ID for
|
||||
+ * \param[in] node_state_id UUID of node that attribute value is for
|
||||
+ *
|
||||
+ * \return Newly allocated string with XML ID of \p attr value
|
||||
+ */
|
||||
+char *
|
||||
+attrd_nvpair_id(const attribute_t *attr, const char *node_state_id)
|
||||
+{
|
||||
+ char *nvpair_id = NULL;
|
||||
+
|
||||
+ if (attr->uuid != NULL) {
|
||||
+ pcmk__str_update(&nvpair_id, attr->uuid);
|
||||
+
|
||||
+ } else if (attr->set_id != NULL) {
|
||||
+ nvpair_id = crm_strdup_printf("%s-%s", attr->set_id, attr->id);
|
||||
+
|
||||
+ } else {
|
||||
+ nvpair_id = crm_strdup_printf(XML_CIB_TAG_STATUS "-%s-%s",
|
||||
+ node_state_id, attr->id);
|
||||
+ }
|
||||
+ crm_xml_sanitize_id(nvpair_id);
|
||||
+ return nvpair_id;
|
||||
+}
|
||||
diff --git a/daemons/attrd/attrd_cib.c b/daemons/attrd/attrd_cib.c
|
||||
index 08d3425..d42345f 100644
|
||||
--- a/daemons/attrd/attrd_cib.c
|
||||
+++ b/daemons/attrd/attrd_cib.c
|
||||
@@ -424,23 +424,16 @@ static int
|
||||
add_attr_update(const attribute_t *attr, const char *value, const char *node_id)
|
||||
{
|
||||
char *set_id = attrd_set_id(attr, node_id);
|
||||
- char *attr_id = NULL;
|
||||
+ char *nvpair_id = attrd_nvpair_id(attr, node_id);
|
||||
int rc = pcmk_rc_ok;
|
||||
|
||||
- if (attr->uuid != NULL) {
|
||||
- pcmk__str_update(&attr_id, attr->uuid);
|
||||
+ if (value == NULL) {
|
||||
+ rc = add_unset_attr_update(attr, nvpair_id, node_id, set_id);
|
||||
} else {
|
||||
- attr_id = crm_strdup_printf("%s-%s", set_id, attr->id);
|
||||
- }
|
||||
- crm_xml_sanitize_id(attr_id);
|
||||
-
|
||||
- if (value != NULL) {
|
||||
- rc = add_set_attr_update(attr, attr_id, node_id, set_id, value);
|
||||
- } else {
|
||||
- rc = add_unset_attr_update(attr, attr_id, node_id, set_id);
|
||||
+ rc = add_set_attr_update(attr, nvpair_id, node_id, set_id, value);
|
||||
}
|
||||
free(set_id);
|
||||
- free(attr_id);
|
||||
+ free(nvpair_id);
|
||||
return rc;
|
||||
}
|
||||
|
||||
diff --git a/daemons/attrd/pacemaker-attrd.h b/daemons/attrd/pacemaker-attrd.h
|
||||
index 3da7f8d..deec790 100644
|
||||
--- a/daemons/attrd/pacemaker-attrd.h
|
||||
+++ b/daemons/attrd/pacemaker-attrd.h
|
||||
@@ -196,6 +196,7 @@ void attrd_free_attribute(gpointer data);
|
||||
void attrd_free_attribute_value(gpointer data);
|
||||
attribute_t *attrd_populate_attribute(xmlNode *xml, const char *attr);
|
||||
char *attrd_set_id(const attribute_t *attr, const char *node_state_id);
|
||||
+char *attrd_nvpair_id(const attribute_t *attr, const char *node_state_id);
|
||||
|
||||
enum attrd_write_options {
|
||||
attrd_write_changed = 0,
|
||||
--
|
||||
2.31.1
|
||||
|
||||
From 2abde6cb87d2e3d31a370c74656f6f7c0818c185 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Thu, 18 Jan 2024 10:01:56 -0600
|
||||
Subject: [PATCH 5/5] Log: pacemaker-attrd: improve some messages for debugging
|
||||
|
||||
---
|
||||
daemons/attrd/attrd_attributes.c | 8 +++++---
|
||||
daemons/attrd/attrd_cib.c | 13 +++++++++----
|
||||
daemons/attrd/attrd_corosync.c | 10 ++++++----
|
||||
3 files changed, 20 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/daemons/attrd/attrd_attributes.c b/daemons/attrd/attrd_attributes.c
|
||||
index 23de2e2..68b9585 100644
|
||||
--- a/daemons/attrd/attrd_attributes.c
|
||||
+++ b/daemons/attrd/attrd_attributes.c
|
||||
@@ -60,13 +60,10 @@ attrd_create_attribute(xmlNode *xml)
|
||||
a->values = pcmk__strikey_table(NULL, attrd_free_attribute_value);
|
||||
|
||||
a->user = crm_element_value_copy(xml, PCMK__XA_ATTR_USER);
|
||||
- crm_trace("Performing all %s operations as user '%s'", a->id, a->user);
|
||||
|
||||
if (dampen_s != NULL) {
|
||||
dampen = crm_get_msec(dampen_s);
|
||||
}
|
||||
- crm_trace("Created attribute %s with %s write delay", a->id,
|
||||
- (a->timeout_ms == 0)? "no" : pcmk__readable_interval(a->timeout_ms));
|
||||
|
||||
if(dampen > 0) {
|
||||
a->timeout_ms = dampen;
|
||||
@@ -75,6 +72,11 @@ attrd_create_attribute(xmlNode *xml)
|
||||
crm_warn("Ignoring invalid delay %s for attribute %s", dampen_s, a->id);
|
||||
}
|
||||
|
||||
+ crm_trace("Created attribute %s with %s write delay and %s CIB user",
|
||||
+ a->id,
|
||||
+ ((dampen > 0)? pcmk__readable_interval(a->timeout_ms) : "no"),
|
||||
+ pcmk__s(a->user, "default"));
|
||||
+
|
||||
g_hash_table_replace(attributes, a->id, a);
|
||||
return a;
|
||||
}
|
||||
diff --git a/daemons/attrd/attrd_cib.c b/daemons/attrd/attrd_cib.c
|
||||
index d42345f..cae6846 100644
|
||||
--- a/daemons/attrd/attrd_cib.c
|
||||
+++ b/daemons/attrd/attrd_cib.c
|
||||
@@ -54,6 +54,7 @@ attrd_cib_updated_cb(const char *event, xmlNode *msg)
|
||||
bool status_changed = false;
|
||||
|
||||
if (attrd_shutting_down(true)) {
|
||||
+ crm_debug("Ignoring CIB change during shutdown");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -278,11 +279,13 @@ attrd_cib_callback(xmlNode *msg, int call_id, int rc, xmlNode *output, void *use
|
||||
|
||||
g_hash_table_iter_init(&iter, a->values);
|
||||
while (g_hash_table_iter_next(&iter, (gpointer *) & peer, (gpointer *) & v)) {
|
||||
- do_crm_log(level, "* %s[%s]=%s",
|
||||
- a->id, peer, pcmk__s(v->requested, "(null)"));
|
||||
if (rc == pcmk_ok) {
|
||||
+ crm_info("* Wrote %s[%s]=%s",
|
||||
+ a->id, peer, pcmk__s(v->requested, "(unset)"));
|
||||
pcmk__str_update(&(v->requested), NULL);
|
||||
} else {
|
||||
+ do_crm_log(level, "* Could not write %s[%s]=%s",
|
||||
+ a->id, peer, pcmk__s(v->requested, "(unset)"));
|
||||
a->changed = true; // Reattempt write below if we are still writer
|
||||
}
|
||||
}
|
||||
@@ -292,6 +295,7 @@ attrd_cib_callback(xmlNode *msg, int call_id, int rc, xmlNode *output, void *use
|
||||
/* We deferred a write of a new update because this update was in
|
||||
* progress. Write out the new value without additional delay.
|
||||
*/
|
||||
+ crm_debug("Pending update for %s can be written now", a->id);
|
||||
write_attribute(a, false);
|
||||
|
||||
/* We're re-attempting a write because the original failed; delay
|
||||
@@ -593,8 +597,9 @@ write_attribute(attribute_t *a, bool ignore_delay)
|
||||
continue;
|
||||
}
|
||||
|
||||
- crm_debug("Updating %s[%s]=%s (node uuid=%s id=%" PRIu32 ")",
|
||||
- a->id, v->nodename, v->current, uuid, v->nodeid);
|
||||
+ crm_debug("Writing %s[%s]=%s (node-state-id=%s node-id=%" PRIu32 ")",
|
||||
+ a->id, v->nodename, pcmk__s(v->current, "(unset)"),
|
||||
+ uuid, v->nodeid);
|
||||
cib_updates++;
|
||||
|
||||
/* Preservation of the attribute to transmit alert */
|
||||
diff --git a/daemons/attrd/attrd_corosync.c b/daemons/attrd/attrd_corosync.c
|
||||
index b348d52..6fb847b 100644
|
||||
--- a/daemons/attrd/attrd_corosync.c
|
||||
+++ b/daemons/attrd/attrd_corosync.c
|
||||
@@ -293,7 +293,8 @@ update_attr_on_host(attribute_t *a, const crm_node_t *peer, const xmlNode *xml,
|
||||
|
||||
// Write out new value or start dampening timer
|
||||
if (a->timeout_ms && a->timer) {
|
||||
- crm_trace("Delayed write out (%dms) for %s", a->timeout_ms, attr);
|
||||
+ crm_trace("Delaying write of %s %s for dampening",
|
||||
+ attr, pcmk__readable_interval(a->timeout_ms));
|
||||
mainloop_timer_start(a->timer);
|
||||
} else {
|
||||
attrd_write_or_elect_attribute(a);
|
||||
@@ -307,11 +308,12 @@ update_attr_on_host(attribute_t *a, const crm_node_t *peer, const xmlNode *xml,
|
||||
if (is_force_write == 1 && a->timeout_ms && a->timer) {
|
||||
/* Save forced writing and set change flag. */
|
||||
/* The actual attribute is written by Writer after election. */
|
||||
- crm_trace("Unchanged %s[%s] from %s is %s(Set the forced write flag)",
|
||||
- attr, host, peer->uname, value);
|
||||
+ crm_trace("%s[%s] from %s is unchanged (%s), forcing write",
|
||||
+ attr, host, peer->uname, pcmk__s(value, "unset"));
|
||||
a->force_write = TRUE;
|
||||
} else {
|
||||
- crm_trace("Unchanged %s[%s] from %s is %s", attr, host, peer->uname, value);
|
||||
+ crm_trace("%s[%s] from %s is unchanged (%s)",
|
||||
+ attr, host, peer->uname, pcmk__s(value, "unset"));
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,53 @@
|
|||
From 9c13ce6fe95812308443c188ace8f897e6bce942 Mon Sep 17 00:00:00 2001
|
||||
From: Reid Wahl <nrwahl@protonmail.com>
|
||||
Date: Mon, 29 Jan 2024 11:14:25 -0800
|
||||
Subject: [PATCH] Fix: tools: crm_attribute emits garbage for --node localhost
|
||||
or auto
|
||||
|
||||
This happens because pcmk__node_attr_target() returns its argument if
|
||||
its argument is NULL, "auto", or "localhost" and no relevant environment
|
||||
variables are found. Then crm_attribute frees the return value, makes a
|
||||
copy of it, and assigns it back to options.dest_uname.
|
||||
|
||||
The fix is to check whether the return value is equal to the argument.
|
||||
|
||||
Fixes RHEL-23065
|
||||
|
||||
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
|
||||
---
|
||||
tools/crm_attribute.c | 19 +++++++++++++++++--
|
||||
1 file changed, 17 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/crm_attribute.c b/tools/crm_attribute.c
|
||||
index d221ab85d..636d03dbd 100644
|
||||
--- a/tools/crm_attribute.c
|
||||
+++ b/tools/crm_attribute.c
|
||||
@@ -766,8 +766,23 @@ main(int argc, char **argv)
|
||||
const char *target = pcmk__node_attr_target(options.dest_uname);
|
||||
|
||||
if (target != NULL) {
|
||||
- g_free(options.dest_uname);
|
||||
- options.dest_uname = g_strdup(target);
|
||||
+ /* If options.dest_uname is "auto" or "localhost", then
|
||||
+ * pcmk__node_attr_target() may return it, depending on environment
|
||||
+ * variables. In that case, attribute lookups will fail for "auto"
|
||||
+ * (unless there's a node named "auto"). attrd maps "localhost" to
|
||||
+ * the true local node name for queries.
|
||||
+ *
|
||||
+ * @TODO
|
||||
+ * * Investigate whether "localhost" is mapped to a real node name
|
||||
+ * for non-query commands. If not, possibly modify it so that it
|
||||
+ * is.
|
||||
+ * * Map "auto" to "localhost" (probably).
|
||||
+ */
|
||||
+ if (target != (const char *) options.dest_uname) {
|
||||
+ g_free(options.dest_uname);
|
||||
+ options.dest_uname = g_strdup(target);
|
||||
+ }
|
||||
+
|
||||
} else if (getenv("CIB_file") != NULL && options.dest_uname == NULL) {
|
||||
get_node_name_from_local();
|
||||
}
|
||||
--
|
||||
2.41.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,65 +0,0 @@
|
|||
From ed8b2c86ab77aaa3d7fd688c049ad5e1b922a9c6 Mon Sep 17 00:00:00 2001
|
||||
From: Reid Wahl <nrwahl@protonmail.com>
|
||||
Date: Thu, 13 Jan 2022 02:56:55 -0800
|
||||
Subject: [PATCH] Fix: liblrmd: Avoid double-free during notify operation
|
||||
|
||||
This commit fixes a regression introduced by 31c7fa8a, causing a
|
||||
double-free in notify operations. lrmd_dispatch_internal() assigns the
|
||||
exit_reason string directly from an XML node to a new lrmd_event_data_t
|
||||
object (without duplicating), and this string gets freed twice.
|
||||
|
||||
Free #1: pcmk__create_history_xml() (reached via callback) calls
|
||||
lrmd__set_result(), which frees event.exit_reason and sets it to NULL.
|
||||
Free #2: lrmd_ipc_dispatch() frees the XML node, which contains a
|
||||
pointer to the exit_reason string just freed, after
|
||||
lrmd_dispatch_internal() returns.
|
||||
|
||||
Prior to 31c7fa8a, pcmk__create_history_xml reset event.rc and
|
||||
event.op_status but **not** event.exit_reason.
|
||||
|
||||
In this commit we simply make a copy of event.exit_reason in
|
||||
lrmd_dispatch_internal() before the callback. This way we don't have to
|
||||
worry about whatever happens in the callback, and we can continue to
|
||||
unset the exit_reason alongside the rc and op_status. The added overhead
|
||||
should be minimal.
|
||||
|
||||
This commit also makes a copy of output. That's not strictly necessary
|
||||
but adds some futureproofing and allows us to call lrmd__reset_result()
|
||||
at the end of lrmd_dispatch_internal().
|
||||
|
||||
Resolves: RHBZ#2039675
|
||||
|
||||
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
|
||||
---
|
||||
lib/lrmd/lrmd_client.c | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/lrmd/lrmd_client.c b/lib/lrmd/lrmd_client.c
|
||||
index ee31bb5ae9..5131a648b7 100644
|
||||
--- a/lib/lrmd/lrmd_client.c
|
||||
+++ b/lib/lrmd/lrmd_client.c
|
||||
@@ -305,9 +305,10 @@ lrmd_dispatch_internal(lrmd_t * lrmd, xmlNode * msg)
|
||||
event.user_data = crm_element_value(msg, F_LRMD_RSC_USERDATA_STR);
|
||||
event.type = lrmd_event_exec_complete;
|
||||
|
||||
- // No need to duplicate the memory, so don't use setter functions
|
||||
- event.output = crm_element_value(msg, F_LRMD_RSC_OUTPUT);
|
||||
- event.exit_reason = crm_element_value(msg, F_LRMD_RSC_EXIT_REASON);
|
||||
+ /* output and exit_reason may be freed by a callback */
|
||||
+ event.output = crm_element_value_copy(msg, F_LRMD_RSC_OUTPUT);
|
||||
+ lrmd__set_result(&event, event.rc, event.op_status,
|
||||
+ crm_element_value(msg, F_LRMD_RSC_EXIT_REASON));
|
||||
|
||||
event.params = xml2list(msg);
|
||||
} else if (pcmk__str_eq(type, LRMD_OP_NEW_CLIENT, pcmk__str_none)) {
|
||||
@@ -324,6 +325,7 @@ lrmd_dispatch_internal(lrmd_t * lrmd, xmlNode * msg)
|
||||
if (event.params) {
|
||||
g_hash_table_destroy(event.params);
|
||||
}
|
||||
+ lrmd__reset_result(&event);
|
||||
}
|
||||
|
||||
// \return Always 0, to indicate that IPC mainloop source should be kept
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From 186d5a02fba919c455fd6eeb050b4be107f82159 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Lumens <clumens@redhat.com>
|
||||
Date: Thu, 13 Jan 2022 17:02:47 -0500
|
||||
Subject: [PATCH] Low: scheduler: Use the old RC code to log maskable probe
|
||||
failures.
|
||||
|
||||
---
|
||||
lib/pengine/unpack.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
|
||||
index 8a2d2a6d6d..b01f86257a 100644
|
||||
--- a/lib/pengine/unpack.c
|
||||
+++ b/lib/pengine/unpack.c
|
||||
@@ -3780,7 +3780,7 @@ unpack_rsc_op(pe_resource_t *rsc, pe_node_t *node, xmlNode *xml_op,
|
||||
|
||||
if (maskable_probe_failure) {
|
||||
crm_notice("Treating probe result '%s' for %s on %s as 'not running'",
|
||||
- services_ocf_exitcode_str(rc), rsc->id, node->details->uname);
|
||||
+ services_ocf_exitcode_str(old_rc), rsc->id, node->details->uname);
|
||||
update_resource_state(rsc, node, xml_op, task, target_rc, *last_failure,
|
||||
on_fail, data_set);
|
||||
crm_xml_add(xml_op, XML_ATTR_UNAME, node->details->uname);
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,56 +0,0 @@
|
|||
From e330568504ec379ea42460d21a2e20b1652d9445 Mon Sep 17 00:00:00 2001
|
||||
From: Reid Wahl <nrwahl@protonmail.com>
|
||||
Date: Fri, 14 Jan 2022 01:35:35 -0800
|
||||
Subject: [PATCH] Fix: fencing: Don't set stonith action to pending if fork
|
||||
fails
|
||||
|
||||
Currently, we set a stonith action to pending if
|
||||
services_action_async_fork_notify() returns true. However, "true" means
|
||||
that the svc_action should not be freed. This might be because the
|
||||
svc_action forked successfully and is pending, or it might be because
|
||||
the svc_action has already been freed.
|
||||
|
||||
In the case of stonith actions, if we fail to fork, the stonith_action_t
|
||||
object stored in svc_action->cb_data gets freed by the done callback,
|
||||
and services_action_async_fork_notify() returns true. If we try to set
|
||||
the action to pending, it causes a segfault.
|
||||
|
||||
This commit moves the "set to pending" step to the
|
||||
stonith_action_async_forked() callback. We avoid the segfault and only
|
||||
set it to pending if it's actually pending.
|
||||
|
||||
A slight difference in ordering was required to achieve this. Now, the
|
||||
action gets set to pending immediately before being added to the
|
||||
mainloop, instead of immediately after.
|
||||
|
||||
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
|
||||
---
|
||||
lib/fencing/st_actions.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/fencing/st_actions.c b/lib/fencing/st_actions.c
|
||||
index e4e43225cd..306001af69 100644
|
||||
--- a/lib/fencing/st_actions.c
|
||||
+++ b/lib/fencing/st_actions.c
|
||||
@@ -550,6 +550,9 @@ stonith_action_async_forked(svc_action_t *svc_action)
|
||||
(action->fork_cb) (svc_action->pid, action->userdata);
|
||||
}
|
||||
|
||||
+ pcmk__set_result(&(action->result), PCMK_OCF_UNKNOWN, PCMK_EXEC_PENDING,
|
||||
+ NULL);
|
||||
+
|
||||
crm_trace("Child process %d performing action '%s' successfully forked",
|
||||
action->pid, action->action);
|
||||
}
|
||||
@@ -619,8 +622,6 @@ internal_stonith_action_execute(stonith_action_t * action)
|
||||
if (services_action_async_fork_notify(svc_action,
|
||||
&stonith_action_async_done,
|
||||
&stonith_action_async_forked)) {
|
||||
- pcmk__set_result(&(action->result), PCMK_OCF_UNKNOWN,
|
||||
- PCMK_EXEC_PENDING, NULL);
|
||||
return pcmk_ok;
|
||||
}
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -1,875 +0,0 @@
|
|||
From 523f62eb235836a01ea039c23ada261a494f7b32 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Wed, 10 Nov 2021 15:22:47 -0600
|
||||
Subject: [PATCH 01/11] Feature: libpacemaker: improve result for high-level
|
||||
fencing API
|
||||
|
||||
Previously, pcmk__fencing_action()'s helpers for asynchronous fencing actions
|
||||
initialized the result to a generic error, and then overrode that only on
|
||||
success.
|
||||
|
||||
Now, set a detailed result for early failures, and use the full result when
|
||||
available from the fencing API.
|
||||
|
||||
A standard return code is still returned to callers at this point.
|
||||
---
|
||||
lib/pacemaker/pcmk_fence.c | 31 ++++++++++++++++++-------------
|
||||
1 file changed, 18 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/lib/pacemaker/pcmk_fence.c b/lib/pacemaker/pcmk_fence.c
|
||||
index 7d6acd0de6..125e1b268b 100644
|
||||
--- a/lib/pacemaker/pcmk_fence.c
|
||||
+++ b/lib/pacemaker/pcmk_fence.c
|
||||
@@ -32,8 +32,8 @@ static struct {
|
||||
unsigned int timeout;
|
||||
unsigned int tolerance;
|
||||
int delay;
|
||||
- int rc;
|
||||
-} async_fence_data;
|
||||
+ pcmk__action_result_t result;
|
||||
+} async_fence_data = { NULL, };
|
||||
|
||||
static int
|
||||
handle_level(stonith_t *st, char *target, int fence_level,
|
||||
@@ -76,14 +76,13 @@ handle_level(stonith_t *st, char *target, int fence_level,
|
||||
static void
|
||||
notify_callback(stonith_t * st, stonith_event_t * e)
|
||||
{
|
||||
- if (e->result != pcmk_ok) {
|
||||
- return;
|
||||
- }
|
||||
+ if (pcmk__str_eq(async_fence_data.target, e->target, pcmk__str_casei)
|
||||
+ && pcmk__str_eq(async_fence_data.action, e->action, pcmk__str_casei)) {
|
||||
|
||||
- if (pcmk__str_eq(async_fence_data.target, e->target, pcmk__str_casei) &&
|
||||
- pcmk__str_eq(async_fence_data.action, e->action, pcmk__str_casei)) {
|
||||
-
|
||||
- async_fence_data.rc = e->result;
|
||||
+ pcmk__set_result(&async_fence_data.result,
|
||||
+ stonith__event_exit_status(e),
|
||||
+ stonith__event_execution_status(e),
|
||||
+ stonith__event_exit_reason(e));
|
||||
g_main_loop_quit(mainloop);
|
||||
}
|
||||
}
|
||||
@@ -91,8 +90,9 @@ notify_callback(stonith_t * st, stonith_event_t * e)
|
||||
static void
|
||||
fence_callback(stonith_t * stonith, stonith_callback_data_t * data)
|
||||
{
|
||||
- async_fence_data.rc = data->rc;
|
||||
-
|
||||
+ pcmk__set_result(&async_fence_data.result, stonith__exit_status(data),
|
||||
+ stonith__execution_status(data),
|
||||
+ stonith__exit_reason(data));
|
||||
g_main_loop_quit(mainloop);
|
||||
}
|
||||
|
||||
@@ -106,6 +106,8 @@ async_fence_helper(gpointer user_data)
|
||||
if (rc != pcmk_ok) {
|
||||
fprintf(stderr, "Could not connect to fencer: %s\n", pcmk_strerror(rc));
|
||||
g_main_loop_quit(mainloop);
|
||||
+ pcmk__set_result(&async_fence_data.result, CRM_EX_ERROR,
|
||||
+ PCMK_EXEC_NOT_CONNECTED, NULL);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -121,6 +123,8 @@ async_fence_helper(gpointer user_data)
|
||||
|
||||
if (call_id < 0) {
|
||||
g_main_loop_quit(mainloop);
|
||||
+ pcmk__set_result(&async_fence_data.result, CRM_EX_ERROR,
|
||||
+ PCMK_EXEC_ERROR, pcmk_strerror(call_id));
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -146,7 +150,8 @@ pcmk__fence_action(stonith_t *st, const char *target, const char *action,
|
||||
async_fence_data.timeout = timeout;
|
||||
async_fence_data.tolerance = tolerance;
|
||||
async_fence_data.delay = delay;
|
||||
- async_fence_data.rc = pcmk_err_generic;
|
||||
+ pcmk__set_result(&async_fence_data.result, CRM_EX_ERROR, PCMK_EXEC_UNKNOWN,
|
||||
+ NULL);
|
||||
|
||||
trig = mainloop_add_trigger(G_PRIORITY_HIGH, async_fence_helper, NULL);
|
||||
mainloop_set_trigger(trig);
|
||||
@@ -156,7 +161,7 @@ pcmk__fence_action(stonith_t *st, const char *target, const char *action,
|
||||
|
||||
free(async_fence_data.name);
|
||||
|
||||
- return pcmk_legacy2rc(async_fence_data.rc);
|
||||
+ return stonith__result2rc(&async_fence_data.result);
|
||||
}
|
||||
|
||||
#ifdef BUILD_PUBLIC_LIBPACEMAKER
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 008868fae5d1b0d6d8dc61f7acfb3856801ddd52 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Fri, 10 Dec 2021 15:36:10 -0600
|
||||
Subject: [PATCH 02/11] Refactor: libpacemaker: add exit reason to high-level
|
||||
fencing API
|
||||
|
||||
Nothing uses it as of this commit
|
||||
---
|
||||
include/pacemaker.h | 5 ++++-
|
||||
include/pcmki/pcmki_fence.h | 5 ++++-
|
||||
lib/pacemaker/pcmk_fence.c | 10 +++++++---
|
||||
tools/stonith_admin.c | 6 +++---
|
||||
4 files changed, 18 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/include/pacemaker.h b/include/pacemaker.h
|
||||
index a8523c969e..0daa4c5945 100644
|
||||
--- a/include/pacemaker.h
|
||||
+++ b/include/pacemaker.h
|
||||
@@ -189,12 +189,15 @@ int pcmk_list_nodes(xmlNodePtr *xml, char *node_types);
|
||||
* again.
|
||||
* \param[in] delay Apply a fencing delay. Value -1 means disable also any
|
||||
* static/random fencing delays from pcmk_delay_base/max.
|
||||
+ * \param[out] reason If not NULL, where to put descriptive failure reason
|
||||
*
|
||||
* \return Standard Pacemaker return code
|
||||
+ * \note If \p reason is not NULL, the caller is responsible for freeing its
|
||||
+ * returned value.
|
||||
*/
|
||||
int pcmk_fence_action(stonith_t *st, const char *target, const char *action,
|
||||
const char *name, unsigned int timeout, unsigned int tolerance,
|
||||
- int delay);
|
||||
+ int delay, char **reason);
|
||||
|
||||
/*!
|
||||
* \brief List the fencing operations that have occurred for a specific node.
|
||||
diff --git a/include/pcmki/pcmki_fence.h b/include/pcmki/pcmki_fence.h
|
||||
index d4cef68f5c..c3da0361d7 100644
|
||||
--- a/include/pcmki/pcmki_fence.h
|
||||
+++ b/include/pcmki/pcmki_fence.h
|
||||
@@ -28,12 +28,15 @@
|
||||
* again.
|
||||
* \param[in] delay Apply a fencing delay. Value -1 means disable also any
|
||||
* static/random fencing delays from pcmk_delay_base/max
|
||||
+ * \param[out] reason If not NULL, where to put descriptive failure reason
|
||||
*
|
||||
* \return Standard Pacemaker return code
|
||||
+ * \note If \p reason is not NULL, the caller is responsible for freeing its
|
||||
+ * returned value.
|
||||
*/
|
||||
int pcmk__fence_action(stonith_t *st, const char *target, const char *action,
|
||||
const char *name, unsigned int timeout, unsigned int tolerance,
|
||||
- int delay);
|
||||
+ int delay, char **reason);
|
||||
|
||||
/*!
|
||||
* \brief List the fencing operations that have occurred for a specific node.
|
||||
diff --git a/lib/pacemaker/pcmk_fence.c b/lib/pacemaker/pcmk_fence.c
|
||||
index 125e1b268b..dbf084fb6b 100644
|
||||
--- a/lib/pacemaker/pcmk_fence.c
|
||||
+++ b/lib/pacemaker/pcmk_fence.c
|
||||
@@ -139,7 +139,7 @@ async_fence_helper(gpointer user_data)
|
||||
int
|
||||
pcmk__fence_action(stonith_t *st, const char *target, const char *action,
|
||||
const char *name, unsigned int timeout, unsigned int tolerance,
|
||||
- int delay)
|
||||
+ int delay, char **reason)
|
||||
{
|
||||
crm_trigger_t *trig;
|
||||
|
||||
@@ -161,6 +161,9 @@ pcmk__fence_action(stonith_t *st, const char *target, const char *action,
|
||||
|
||||
free(async_fence_data.name);
|
||||
|
||||
+ if ((reason != NULL) && (async_fence_data.result.exit_reason != NULL)) {
|
||||
+ *reason = strdup(async_fence_data.result.exit_reason);
|
||||
+ }
|
||||
return stonith__result2rc(&async_fence_data.result);
|
||||
}
|
||||
|
||||
@@ -168,9 +171,10 @@ pcmk__fence_action(stonith_t *st, const char *target, const char *action,
|
||||
int
|
||||
pcmk_fence_action(stonith_t *st, const char *target, const char *action,
|
||||
const char *name, unsigned int timeout, unsigned int tolerance,
|
||||
- int delay)
|
||||
+ int delay, char **reason)
|
||||
{
|
||||
- return pcmk__fence_action(st, target, action, name, timeout, tolerance, delay);
|
||||
+ return pcmk__fence_action(st, target, action, name, timeout, tolerance,
|
||||
+ delay, reason);
|
||||
}
|
||||
#endif
|
||||
|
||||
diff --git a/tools/stonith_admin.c b/tools/stonith_admin.c
|
||||
index 2d48326e1b..fdc7c46d49 100644
|
||||
--- a/tools/stonith_admin.c
|
||||
+++ b/tools/stonith_admin.c
|
||||
@@ -571,17 +571,17 @@ main(int argc, char **argv)
|
||||
|
||||
case 'B':
|
||||
rc = pcmk__fence_action(st, target, "reboot", name, options.timeout*1000,
|
||||
- options.tolerance*1000, options.delay);
|
||||
+ options.tolerance*1000, options.delay, NULL);
|
||||
break;
|
||||
|
||||
case 'F':
|
||||
rc = pcmk__fence_action(st, target, "off", name, options.timeout*1000,
|
||||
- options.tolerance*1000, options.delay);
|
||||
+ options.tolerance*1000, options.delay, NULL);
|
||||
break;
|
||||
|
||||
case 'U':
|
||||
rc = pcmk__fence_action(st, target, "on", name, options.timeout*1000,
|
||||
- options.tolerance*1000, options.delay);
|
||||
+ options.tolerance*1000, options.delay, NULL);
|
||||
break;
|
||||
|
||||
case 'h':
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 7570510f9985ba75ef73fb824f28109e135ace0a Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Fri, 10 Dec 2021 15:40:48 -0600
|
||||
Subject: [PATCH 03/11] Refactor: libpacemaker: rename high-level fencing API
|
||||
|
||||
Rename pcmk_fence_action() to pcmk_request_fencing(), and its internal
|
||||
equivalent pcmk__fence_action() to pcmk__request_fencing(). The change is
|
||||
backward-compatible because pcmk_fence_action() has not been exposed publicly
|
||||
yet.
|
||||
|
||||
"Fence action" can be easily confused with libcrmservice actions, liblrmd
|
||||
actions, libstonithd actions, scheduler actions, and so forth.
|
||||
|
||||
Also, the new name makes it clearer that the caller is requesting that the
|
||||
cluster perform fencing, and not directly performing fencing.
|
||||
---
|
||||
include/pacemaker.h | 20 ++++++++++----------
|
||||
include/pcmki/pcmki_fence.h | 16 ++++++++--------
|
||||
lib/pacemaker/pcmk_fence.c | 16 ++++++++--------
|
||||
tools/stonith_admin.c | 18 ++++++++++++------
|
||||
4 files changed, 38 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/include/pacemaker.h b/include/pacemaker.h
|
||||
index 0daa4c5945..e581f975a9 100644
|
||||
--- a/include/pacemaker.h
|
||||
+++ b/include/pacemaker.h
|
||||
@@ -177,27 +177,27 @@ int pcmk_list_nodes(xmlNodePtr *xml, char *node_types);
|
||||
#ifdef BUILD_PUBLIC_LIBPACEMAKER
|
||||
|
||||
/*!
|
||||
- * \brief Perform a STONITH action.
|
||||
+ * \brief Ask the cluster to perform fencing
|
||||
*
|
||||
- * \param[in] st A connection to the STONITH API.
|
||||
- * \param[in] target The node receiving the action.
|
||||
- * \param[in] action The action to perform.
|
||||
+ * \param[in] st A connection to the fencer API
|
||||
+ * \param[in] target The node that should be fenced
|
||||
+ * \param[in] action The fencing action (on, off, reboot) to perform
|
||||
* \param[in] name Who requested the fence action?
|
||||
- * \param[in] timeout How long to wait for the operation to complete (in ms).
|
||||
+ * \param[in] timeout How long to wait for the operation to complete (in ms)
|
||||
* \param[in] tolerance If a successful action for \p target happened within
|
||||
* this many ms, return 0 without performing the action
|
||||
- * again.
|
||||
+ * again
|
||||
* \param[in] delay Apply a fencing delay. Value -1 means disable also any
|
||||
- * static/random fencing delays from pcmk_delay_base/max.
|
||||
+ * static/random fencing delays from pcmk_delay_base/max
|
||||
* \param[out] reason If not NULL, where to put descriptive failure reason
|
||||
*
|
||||
* \return Standard Pacemaker return code
|
||||
* \note If \p reason is not NULL, the caller is responsible for freeing its
|
||||
* returned value.
|
||||
*/
|
||||
-int pcmk_fence_action(stonith_t *st, const char *target, const char *action,
|
||||
- const char *name, unsigned int timeout, unsigned int tolerance,
|
||||
- int delay, char **reason);
|
||||
+int pcmk_request_fencing(stonith_t *st, const char *target, const char *action,
|
||||
+ const char *name, unsigned int timeout,
|
||||
+ unsigned int tolerance, int delay, char **reason);
|
||||
|
||||
/*!
|
||||
* \brief List the fencing operations that have occurred for a specific node.
|
||||
diff --git a/include/pcmki/pcmki_fence.h b/include/pcmki/pcmki_fence.h
|
||||
index c3da0361d7..e3a7e27264 100644
|
||||
--- a/include/pcmki/pcmki_fence.h
|
||||
+++ b/include/pcmki/pcmki_fence.h
|
||||
@@ -13,14 +13,14 @@
|
||||
# include <crm/common/output_internal.h>
|
||||
|
||||
/*!
|
||||
- * \brief Perform a STONITH action.
|
||||
+ * \brief Ask the cluster to perform fencing
|
||||
*
|
||||
- * \note This is the internal version of pcmk_fence_action(). External users
|
||||
+ * \note This is the internal version of pcmk_request_fencing(). External users
|
||||
* of the pacemaker API should use that function instead.
|
||||
*
|
||||
- * \param[in] st A connection to the STONITH API.
|
||||
- * \param[in] target The node receiving the action.
|
||||
- * \param[in] action The action to perform.
|
||||
+ * \param[in] st A connection to the fencer API
|
||||
+ * \param[in] target The node that should be fenced
|
||||
+ * \param[in] action The fencing action (on, off, reboot) to perform
|
||||
* \param[in] name Who requested the fence action?
|
||||
* \param[in] timeout How long to wait for the operation to complete (in ms).
|
||||
* \param[in] tolerance If a successful action for \p target happened within
|
||||
@@ -34,9 +34,9 @@
|
||||
* \note If \p reason is not NULL, the caller is responsible for freeing its
|
||||
* returned value.
|
||||
*/
|
||||
-int pcmk__fence_action(stonith_t *st, const char *target, const char *action,
|
||||
- const char *name, unsigned int timeout, unsigned int tolerance,
|
||||
- int delay, char **reason);
|
||||
+int pcmk__request_fencing(stonith_t *st, const char *target, const char *action,
|
||||
+ const char *name, unsigned int timeout,
|
||||
+ unsigned int tolerance, int delay, char **reason);
|
||||
|
||||
/*!
|
||||
* \brief List the fencing operations that have occurred for a specific node.
|
||||
diff --git a/lib/pacemaker/pcmk_fence.c b/lib/pacemaker/pcmk_fence.c
|
||||
index dbf084fb6b..1b7feb54b2 100644
|
||||
--- a/lib/pacemaker/pcmk_fence.c
|
||||
+++ b/lib/pacemaker/pcmk_fence.c
|
||||
@@ -137,9 +137,9 @@ async_fence_helper(gpointer user_data)
|
||||
}
|
||||
|
||||
int
|
||||
-pcmk__fence_action(stonith_t *st, const char *target, const char *action,
|
||||
- const char *name, unsigned int timeout, unsigned int tolerance,
|
||||
- int delay, char **reason)
|
||||
+pcmk__request_fencing(stonith_t *st, const char *target, const char *action,
|
||||
+ const char *name, unsigned int timeout,
|
||||
+ unsigned int tolerance, int delay, char **reason)
|
||||
{
|
||||
crm_trigger_t *trig;
|
||||
|
||||
@@ -169,12 +169,12 @@ pcmk__fence_action(stonith_t *st, const char *target, const char *action,
|
||||
|
||||
#ifdef BUILD_PUBLIC_LIBPACEMAKER
|
||||
int
|
||||
-pcmk_fence_action(stonith_t *st, const char *target, const char *action,
|
||||
- const char *name, unsigned int timeout, unsigned int tolerance,
|
||||
- int delay, char **reason)
|
||||
+pcmk_request_fencing(stonith_t *st, const char *target, const char *action,
|
||||
+ const char *name, unsigned int timeout,
|
||||
+ unsigned int tolerance, int delay, char **reason)
|
||||
{
|
||||
- return pcmk__fence_action(st, target, action, name, timeout, tolerance,
|
||||
- delay, reason);
|
||||
+ return pcmk__request_fencing(st, target, action, name, timeout, tolerance,
|
||||
+ delay, reason);
|
||||
}
|
||||
#endif
|
||||
|
||||
diff --git a/tools/stonith_admin.c b/tools/stonith_admin.c
|
||||
index fdc7c46d49..56948b3875 100644
|
||||
--- a/tools/stonith_admin.c
|
||||
+++ b/tools/stonith_admin.c
|
||||
@@ -570,18 +570,24 @@ main(int argc, char **argv)
|
||||
break;
|
||||
|
||||
case 'B':
|
||||
- rc = pcmk__fence_action(st, target, "reboot", name, options.timeout*1000,
|
||||
- options.tolerance*1000, options.delay, NULL);
|
||||
+ rc = pcmk__request_fencing(st, target, "reboot", name,
|
||||
+ options.timeout * 1000,
|
||||
+ options.tolerance * 1000,
|
||||
+ options.delay, NULL);
|
||||
break;
|
||||
|
||||
case 'F':
|
||||
- rc = pcmk__fence_action(st, target, "off", name, options.timeout*1000,
|
||||
- options.tolerance*1000, options.delay, NULL);
|
||||
+ rc = pcmk__request_fencing(st, target, "off", name,
|
||||
+ options.timeout * 1000,
|
||||
+ options.tolerance * 1000,
|
||||
+ options.delay, NULL);
|
||||
break;
|
||||
|
||||
case 'U':
|
||||
- rc = pcmk__fence_action(st, target, "on", name, options.timeout*1000,
|
||||
- options.tolerance*1000, options.delay, NULL);
|
||||
+ rc = pcmk__request_fencing(st, target, "on", name,
|
||||
+ options.timeout * 1000,
|
||||
+ options.tolerance * 1000,
|
||||
+ options.delay, NULL);
|
||||
break;
|
||||
|
||||
case 'h':
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 247eb303df934944c0b72b162bb661cee6e0ed8b Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Fri, 10 Dec 2021 15:52:37 -0600
|
||||
Subject: [PATCH 04/11] Refactor: tools: drop unnecessary string duplication in
|
||||
stonith_admin
|
||||
|
||||
---
|
||||
tools/stonith_admin.c | 11 ++++-------
|
||||
1 file changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/tools/stonith_admin.c b/tools/stonith_admin.c
|
||||
index 56948b3875..c11e302e76 100644
|
||||
--- a/tools/stonith_admin.c
|
||||
+++ b/tools/stonith_admin.c
|
||||
@@ -360,8 +360,6 @@ main(int argc, char **argv)
|
||||
|
||||
pcmk__cli_init_logging("stonith_admin", args->verbosity);
|
||||
|
||||
- name = strdup(crm_system_name);
|
||||
-
|
||||
rc = pcmk__output_new(&out, args->output_ty, args->output_dest, argv);
|
||||
if (rc != pcmk_rc_ok) {
|
||||
exit_code = CRM_EX_ERROR;
|
||||
@@ -496,7 +494,7 @@ main(int argc, char **argv)
|
||||
if (st == NULL) {
|
||||
rc = -ENOMEM;
|
||||
} else if (!no_connect) {
|
||||
- rc = st->cmds->connect(st, name, NULL);
|
||||
+ rc = st->cmds->connect(st, crm_system_name, NULL);
|
||||
}
|
||||
if (rc < 0) {
|
||||
out->err(out, "Could not connect to fencer: %s", pcmk_strerror(rc));
|
||||
@@ -570,21 +568,21 @@ main(int argc, char **argv)
|
||||
break;
|
||||
|
||||
case 'B':
|
||||
- rc = pcmk__request_fencing(st, target, "reboot", name,
|
||||
+ rc = pcmk__request_fencing(st, target, "reboot", crm_system_name,
|
||||
options.timeout * 1000,
|
||||
options.tolerance * 1000,
|
||||
options.delay, NULL);
|
||||
break;
|
||||
|
||||
case 'F':
|
||||
- rc = pcmk__request_fencing(st, target, "off", name,
|
||||
+ rc = pcmk__request_fencing(st, target, "off", crm_system_name,
|
||||
options.timeout * 1000,
|
||||
options.tolerance * 1000,
|
||||
options.delay, NULL);
|
||||
break;
|
||||
|
||||
case 'U':
|
||||
- rc = pcmk__request_fencing(st, target, "on", name,
|
||||
+ rc = pcmk__request_fencing(st, target, "on", crm_system_name,
|
||||
options.timeout * 1000,
|
||||
options.tolerance * 1000,
|
||||
options.delay, NULL);
|
||||
@@ -619,7 +617,6 @@ main(int argc, char **argv)
|
||||
out->finish(out, exit_code, true, NULL);
|
||||
pcmk__output_free(out);
|
||||
}
|
||||
- free(name);
|
||||
stonith_key_value_freeall(options.params, 1, 1);
|
||||
|
||||
if (st != NULL) {
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From a7888bf6868d8d9d9c77f65ae9983cf748bb0548 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Fri, 10 Dec 2021 15:56:34 -0600
|
||||
Subject: [PATCH 05/11] Refactor: tools: functionize requesting fencing in
|
||||
stonith_admin
|
||||
|
||||
... to reduce code duplication and improve readability
|
||||
---
|
||||
tools/stonith_admin.c | 27 +++++++++++++++------------
|
||||
1 file changed, 15 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/tools/stonith_admin.c b/tools/stonith_admin.c
|
||||
index c11e302e76..f738a9c888 100644
|
||||
--- a/tools/stonith_admin.c
|
||||
+++ b/tools/stonith_admin.c
|
||||
@@ -331,6 +331,18 @@ build_arg_context(pcmk__common_args_t *args, GOptionGroup **group) {
|
||||
return context;
|
||||
}
|
||||
|
||||
+// \return Standard Pacemaker return code
|
||||
+static int
|
||||
+request_fencing(stonith_t *st, const char *target, const char *command)
|
||||
+{
|
||||
+ int rc = pcmk__request_fencing(st, target, command, crm_system_name,
|
||||
+ options.timeout * 1000,
|
||||
+ options.tolerance * 1000,
|
||||
+ options.delay, NULL);
|
||||
+
|
||||
+ return rc;
|
||||
+}
|
||||
+
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
@@ -568,24 +580,15 @@ main(int argc, char **argv)
|
||||
break;
|
||||
|
||||
case 'B':
|
||||
- rc = pcmk__request_fencing(st, target, "reboot", crm_system_name,
|
||||
- options.timeout * 1000,
|
||||
- options.tolerance * 1000,
|
||||
- options.delay, NULL);
|
||||
+ rc = request_fencing(st, target, "reboot");
|
||||
break;
|
||||
|
||||
case 'F':
|
||||
- rc = pcmk__request_fencing(st, target, "off", crm_system_name,
|
||||
- options.timeout * 1000,
|
||||
- options.tolerance * 1000,
|
||||
- options.delay, NULL);
|
||||
+ rc = request_fencing(st, target, "off");
|
||||
break;
|
||||
|
||||
case 'U':
|
||||
- rc = pcmk__request_fencing(st, target, "on", crm_system_name,
|
||||
- options.timeout * 1000,
|
||||
- options.tolerance * 1000,
|
||||
- options.delay, NULL);
|
||||
+ rc = request_fencing(st, target, "on");
|
||||
break;
|
||||
|
||||
case 'h':
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 2da32df780983ec1197e857eed5eeb5bf1101889 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Fri, 10 Dec 2021 16:05:19 -0600
|
||||
Subject: [PATCH 06/11] Feature: tools: display failure reasons for
|
||||
stonith_admin fencing commands
|
||||
|
||||
Previously, stonith_admin's --fence/--unfence/--reboot options did not output
|
||||
any error message on failure. Now, they do, including the exit reason, if
|
||||
available.
|
||||
---
|
||||
tools/stonith_admin.c | 30 +++++++++++++++++++++++++-----
|
||||
1 file changed, 25 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/tools/stonith_admin.c b/tools/stonith_admin.c
|
||||
index f738a9c888..5590faf11e 100644
|
||||
--- a/tools/stonith_admin.c
|
||||
+++ b/tools/stonith_admin.c
|
||||
@@ -333,13 +333,33 @@ build_arg_context(pcmk__common_args_t *args, GOptionGroup **group) {
|
||||
|
||||
// \return Standard Pacemaker return code
|
||||
static int
|
||||
-request_fencing(stonith_t *st, const char *target, const char *command)
|
||||
+request_fencing(stonith_t *st, const char *target, const char *command,
|
||||
+ GError **error)
|
||||
{
|
||||
+ char *reason = NULL;
|
||||
int rc = pcmk__request_fencing(st, target, command, crm_system_name,
|
||||
options.timeout * 1000,
|
||||
options.tolerance * 1000,
|
||||
- options.delay, NULL);
|
||||
+ options.delay, &reason);
|
||||
|
||||
+ if (rc != pcmk_rc_ok) {
|
||||
+ const char *rc_str = pcmk_rc_str(rc);
|
||||
+
|
||||
+ // If reason is identical to return code string, don't display it twice
|
||||
+ if (pcmk__str_eq(rc_str, reason, pcmk__str_none)) {
|
||||
+ free(reason);
|
||||
+ reason = NULL;
|
||||
+ }
|
||||
+
|
||||
+ g_set_error(error, PCMK__RC_ERROR, rc,
|
||||
+ "Couldn't %sfence %s: %s%s%s%s",
|
||||
+ ((strcmp(command, "on") == 0)? "un" : ""),
|
||||
+ target, pcmk_rc_str(rc),
|
||||
+ ((reason == NULL)? "" : " ("),
|
||||
+ ((reason == NULL)? "" : reason),
|
||||
+ ((reason == NULL)? "" : ")"));
|
||||
+ }
|
||||
+ free(reason);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -580,15 +600,15 @@ main(int argc, char **argv)
|
||||
break;
|
||||
|
||||
case 'B':
|
||||
- rc = request_fencing(st, target, "reboot");
|
||||
+ rc = request_fencing(st, target, "reboot", &error);
|
||||
break;
|
||||
|
||||
case 'F':
|
||||
- rc = request_fencing(st, target, "off");
|
||||
+ rc = request_fencing(st, target, "off", &error);
|
||||
break;
|
||||
|
||||
case 'U':
|
||||
- rc = request_fencing(st, target, "on");
|
||||
+ rc = request_fencing(st, target, "on", &error);
|
||||
break;
|
||||
|
||||
case 'h':
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 2d99eba4c326d3b13dbbe446971ea5febd5d05be Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Fri, 10 Dec 2021 16:08:49 -0600
|
||||
Subject: [PATCH 07/11] Feature: libpacemaker: return exit reason for fencer
|
||||
connection failures
|
||||
|
||||
... instead of outputting to stderr directly, so that the caller (i.e.
|
||||
stonith_admin) can output the error in the correct output format.
|
||||
---
|
||||
lib/pacemaker/pcmk_fence.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/pacemaker/pcmk_fence.c b/lib/pacemaker/pcmk_fence.c
|
||||
index 1b7feb54b2..d17b07cda2 100644
|
||||
--- a/lib/pacemaker/pcmk_fence.c
|
||||
+++ b/lib/pacemaker/pcmk_fence.c
|
||||
@@ -104,10 +104,9 @@ async_fence_helper(gpointer user_data)
|
||||
int rc = stonith_api_connect_retry(st, async_fence_data.name, 10);
|
||||
|
||||
if (rc != pcmk_ok) {
|
||||
- fprintf(stderr, "Could not connect to fencer: %s\n", pcmk_strerror(rc));
|
||||
g_main_loop_quit(mainloop);
|
||||
pcmk__set_result(&async_fence_data.result, CRM_EX_ERROR,
|
||||
- PCMK_EXEC_NOT_CONNECTED, NULL);
|
||||
+ PCMK_EXEC_NOT_CONNECTED, pcmk_strerror(rc));
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 4480ef0602f47450bdddfbde360a6a8327710927 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Mon, 17 Jan 2022 09:39:39 -0600
|
||||
Subject: [PATCH 08/11] Low: libpacemaker: compare fence action names
|
||||
case-sensitively
|
||||
|
||||
---
|
||||
lib/pacemaker/pcmk_fence.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/pacemaker/pcmk_fence.c b/lib/pacemaker/pcmk_fence.c
|
||||
index d17b07cda2..2a8f50a555 100644
|
||||
--- a/lib/pacemaker/pcmk_fence.c
|
||||
+++ b/lib/pacemaker/pcmk_fence.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright 2009-2021 the Pacemaker project contributors
|
||||
+ * Copyright 2009-2022 the Pacemaker project contributors
|
||||
*
|
||||
* The version control history for this file may have further details.
|
||||
*
|
||||
@@ -77,7 +77,7 @@ static void
|
||||
notify_callback(stonith_t * st, stonith_event_t * e)
|
||||
{
|
||||
if (pcmk__str_eq(async_fence_data.target, e->target, pcmk__str_casei)
|
||||
- && pcmk__str_eq(async_fence_data.action, e->action, pcmk__str_casei)) {
|
||||
+ && pcmk__str_eq(async_fence_data.action, e->action, pcmk__str_none)) {
|
||||
|
||||
pcmk__set_result(&async_fence_data.result,
|
||||
stonith__event_exit_status(e),
|
||||
@@ -549,7 +549,7 @@ pcmk__reduce_fence_history(stonith_history_t *history)
|
||||
if ((hp->state == st_done) || (hp->state == st_failed)) {
|
||||
/* action not in progress */
|
||||
if (pcmk__str_eq(hp->target, np->target, pcmk__str_casei) &&
|
||||
- pcmk__str_eq(hp->action, np->action, pcmk__str_casei) &&
|
||||
+ pcmk__str_eq(hp->action, np->action, pcmk__str_none) &&
|
||||
(hp->state == np->state) &&
|
||||
((hp->state == st_done) ||
|
||||
pcmk__str_eq(hp->delegate, np->delegate, pcmk__str_casei))) {
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From fe4c65a3b9e715c2b535709f989f2369d3637b78 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Mon, 17 Jan 2022 09:45:24 -0600
|
||||
Subject: [PATCH 09/11] Refactor: libpacemaker: avoid unnecessary string
|
||||
duplication
|
||||
|
||||
... and don't leave any dynamic memory hanging around
|
||||
---
|
||||
lib/pacemaker/pcmk_fence.c | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/pacemaker/pcmk_fence.c b/lib/pacemaker/pcmk_fence.c
|
||||
index 2a8f50a555..260fa5ab8e 100644
|
||||
--- a/lib/pacemaker/pcmk_fence.c
|
||||
+++ b/lib/pacemaker/pcmk_fence.c
|
||||
@@ -141,6 +141,7 @@ pcmk__request_fencing(stonith_t *st, const char *target, const char *action,
|
||||
unsigned int tolerance, int delay, char **reason)
|
||||
{
|
||||
crm_trigger_t *trig;
|
||||
+ int rc = pcmk_rc_ok;
|
||||
|
||||
async_fence_data.st = st;
|
||||
async_fence_data.name = strdup(name);
|
||||
@@ -160,10 +161,14 @@ pcmk__request_fencing(stonith_t *st, const char *target, const char *action,
|
||||
|
||||
free(async_fence_data.name);
|
||||
|
||||
- if ((reason != NULL) && (async_fence_data.result.exit_reason != NULL)) {
|
||||
- *reason = strdup(async_fence_data.result.exit_reason);
|
||||
+ if (reason != NULL) {
|
||||
+ // Give the caller ownership of the exit reason
|
||||
+ *reason = async_fence_data.result.exit_reason;
|
||||
+ async_fence_data.result.exit_reason = NULL;
|
||||
}
|
||||
- return stonith__result2rc(&async_fence_data.result);
|
||||
+ rc = stonith__result2rc(&async_fence_data.result);
|
||||
+ pcmk__reset_result(&async_fence_data.result);
|
||||
+ return rc;
|
||||
}
|
||||
|
||||
#ifdef BUILD_PUBLIC_LIBPACEMAKER
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 7b7af07796f05a1adabdac655582be2e17106f81 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Mon, 17 Jan 2022 10:07:10 -0600
|
||||
Subject: [PATCH 10/11] Doc: libpacemaker: improve pcmk__request_fencing()
|
||||
doxygen block
|
||||
|
||||
---
|
||||
include/pacemaker.h | 6 ++++--
|
||||
include/pcmki/pcmki_fence.h | 15 +++++++++------
|
||||
2 files changed, 13 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/include/pacemaker.h b/include/pacemaker.h
|
||||
index e581f975a9..266a844892 100644
|
||||
--- a/include/pacemaker.h
|
||||
+++ b/include/pacemaker.h
|
||||
@@ -187,8 +187,10 @@ int pcmk_list_nodes(xmlNodePtr *xml, char *node_types);
|
||||
* \param[in] tolerance If a successful action for \p target happened within
|
||||
* this many ms, return 0 without performing the action
|
||||
* again
|
||||
- * \param[in] delay Apply a fencing delay. Value -1 means disable also any
|
||||
- * static/random fencing delays from pcmk_delay_base/max
|
||||
+ * \param[in] delay Apply this delay (in milliseconds) before initiating the
|
||||
+ * fencing action (a value of -1 applies no delay and also
|
||||
+ * disables any fencing delay from pcmk_delay_base and
|
||||
+ * pcmk_delay_max)
|
||||
* \param[out] reason If not NULL, where to put descriptive failure reason
|
||||
*
|
||||
* \return Standard Pacemaker return code
|
||||
diff --git a/include/pcmki/pcmki_fence.h b/include/pcmki/pcmki_fence.h
|
||||
index e3a7e27264..4a2fe3c481 100644
|
||||
--- a/include/pcmki/pcmki_fence.h
|
||||
+++ b/include/pcmki/pcmki_fence.h
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright 2019-2021 the Pacemaker project contributors
|
||||
+ * Copyright 2019-2022 the Pacemaker project contributors
|
||||
*
|
||||
* The version control history for this file may have further details.
|
||||
*
|
||||
@@ -22,17 +22,20 @@
|
||||
* \param[in] target The node that should be fenced
|
||||
* \param[in] action The fencing action (on, off, reboot) to perform
|
||||
* \param[in] name Who requested the fence action?
|
||||
- * \param[in] timeout How long to wait for the operation to complete (in ms).
|
||||
+ * \param[in] timeout How long to wait for the operation to complete (in ms)
|
||||
* \param[in] tolerance If a successful action for \p target happened within
|
||||
- * this many ms, return 0 without performing the action
|
||||
- * again.
|
||||
- * \param[in] delay Apply a fencing delay. Value -1 means disable also any
|
||||
- * static/random fencing delays from pcmk_delay_base/max
|
||||
+ * this many milliseconds, return success without
|
||||
+ * performing the action again
|
||||
+ * \param[in] delay Apply this delay (in milliseconds) before initiating the
|
||||
+ * fencing action (a value of -1 applies no delay and also
|
||||
+ * disables any fencing delay from pcmk_delay_base and
|
||||
+ * pcmk_delay_max)
|
||||
* \param[out] reason If not NULL, where to put descriptive failure reason
|
||||
*
|
||||
* \return Standard Pacemaker return code
|
||||
* \note If \p reason is not NULL, the caller is responsible for freeing its
|
||||
* returned value.
|
||||
+ * \todo delay is eventually used with g_timeout_add() and should be guint
|
||||
*/
|
||||
int pcmk__request_fencing(stonith_t *st, const char *target, const char *action,
|
||||
const char *name, unsigned int timeout,
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 61fb7271712e1246eb6d9472dc1afc7cd10e0a79 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Mon, 17 Jan 2022 10:18:02 -0600
|
||||
Subject: [PATCH 11/11] Fix: tools: get stonith_admin -T option working again
|
||||
|
||||
Regression introduced in 2.0.3 by 3910b6fec
|
||||
|
||||
This reverts commit 247eb303df934944c0b72b162bb661cee6e0ed8b
|
||||
("Refactor: tools: drop unnecessary string duplication in stonith_admin")
|
||||
and fixes a regression introduced when stonith_admin was converted to use
|
||||
GOption.
|
||||
|
||||
The -T option is intended to override the client name passed to the fencer API,
|
||||
but the client name was set to the default (crm_system_name) after option
|
||||
processing had already been done, so any value for -T was overwritten by the
|
||||
default, and its memory was leaked.
|
||||
|
||||
This commit sets the default only if -T was not used.
|
||||
---
|
||||
tools/stonith_admin.c | 15 ++++++++++-----
|
||||
1 file changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/tools/stonith_admin.c b/tools/stonith_admin.c
|
||||
index 5590faf11e..54774b6fee 100644
|
||||
--- a/tools/stonith_admin.c
|
||||
+++ b/tools/stonith_admin.c
|
||||
@@ -337,10 +337,10 @@ request_fencing(stonith_t *st, const char *target, const char *command,
|
||||
GError **error)
|
||||
{
|
||||
char *reason = NULL;
|
||||
- int rc = pcmk__request_fencing(st, target, command, crm_system_name,
|
||||
- options.timeout * 1000,
|
||||
- options.tolerance * 1000,
|
||||
- options.delay, &reason);
|
||||
+ int rc = pcmk__request_fencing(st, target, command, name,
|
||||
+ options.timeout * 1000,
|
||||
+ options.tolerance * 1000,
|
||||
+ options.delay, &reason);
|
||||
|
||||
if (rc != pcmk_rc_ok) {
|
||||
const char *rc_str = pcmk_rc_str(rc);
|
||||
@@ -392,6 +392,10 @@ main(int argc, char **argv)
|
||||
|
||||
pcmk__cli_init_logging("stonith_admin", args->verbosity);
|
||||
|
||||
+ if (name == NULL) {
|
||||
+ name = strdup(crm_system_name);
|
||||
+ }
|
||||
+
|
||||
rc = pcmk__output_new(&out, args->output_ty, args->output_dest, argv);
|
||||
if (rc != pcmk_rc_ok) {
|
||||
exit_code = CRM_EX_ERROR;
|
||||
@@ -526,7 +530,7 @@ main(int argc, char **argv)
|
||||
if (st == NULL) {
|
||||
rc = -ENOMEM;
|
||||
} else if (!no_connect) {
|
||||
- rc = st->cmds->connect(st, crm_system_name, NULL);
|
||||
+ rc = st->cmds->connect(st, name, NULL);
|
||||
}
|
||||
if (rc < 0) {
|
||||
out->err(out, "Could not connect to fencer: %s", pcmk_strerror(rc));
|
||||
@@ -640,6 +644,7 @@ main(int argc, char **argv)
|
||||
out->finish(out, exit_code, true, NULL);
|
||||
pcmk__output_free(out);
|
||||
}
|
||||
+ free(name);
|
||||
stonith_key_value_freeall(options.params, 1, 1);
|
||||
|
||||
if (st != NULL) {
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -1,796 +0,0 @@
|
|||
From 08c3420f2c857e7b27cd960f355d787af534da7d Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 18 Jan 2022 16:04:49 -0600
|
||||
Subject: [PATCH 01/12] Log: libcrmcommon: improve description for "not
|
||||
connected" status
|
||||
|
||||
PCMK_EXEC_NOT_CONNECTED was originally added to represent "No executor
|
||||
connection", but it can also now mean no fencer connection, so change it to
|
||||
"Internal communication failure" which is probably less mysterious to end users
|
||||
anyway (especially since it should be accompanied by a more descriptive exit
|
||||
reason).
|
||||
---
|
||||
include/crm/common/results.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/crm/common/results.h b/include/crm/common/results.h
|
||||
index 873faf5c43..3d322a7ce6 100644
|
||||
--- a/include/crm/common/results.h
|
||||
+++ b/include/crm/common/results.h
|
||||
@@ -349,7 +349,7 @@ pcmk_exec_status_str(enum pcmk_exec_status status)
|
||||
case PCMK_EXEC_ERROR_HARD: return "Hard error";
|
||||
case PCMK_EXEC_ERROR_FATAL: return "Fatal error";
|
||||
case PCMK_EXEC_NOT_INSTALLED: return "Not installed";
|
||||
- case PCMK_EXEC_NOT_CONNECTED: return "No executor connection";
|
||||
+ case PCMK_EXEC_NOT_CONNECTED: return "Internal communication failure";
|
||||
case PCMK_EXEC_INVALID: return "Cannot execute now";
|
||||
case PCMK_EXEC_NO_FENCE_DEVICE: return "No fence device";
|
||||
case PCMK_EXEC_NO_SECRETS: return "CIB secrets unavailable";
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 7c345cf8cf0cb054f5634206880df035bfef7311 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Mon, 20 Dec 2021 15:12:36 -0600
|
||||
Subject: [PATCH 02/12] Refactor: libcrmcommon: drop unnecessary system error
|
||||
redefinitions
|
||||
|
||||
portability.h defines some system error codes that might not be present on
|
||||
non-Linux systems.
|
||||
|
||||
This was a bad idea, since there's no way to ensure the defined values don't
|
||||
conflict with existing system codes. However, we use a number of them, so it's
|
||||
probably best to keep them, at least until we can make a backward compatibility
|
||||
break.
|
||||
|
||||
However, we don't use EUNATCH, ENOSR, or ENOSTR, so we can delete those.
|
||||
---
|
||||
include/portability.h | 12 ------------
|
||||
lib/common/results.c | 9 ++++++---
|
||||
2 files changed, 6 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/include/portability.h b/include/portability.h
|
||||
index 9a60c583a7..ee065a376d 100644
|
||||
--- a/include/portability.h
|
||||
+++ b/include/portability.h
|
||||
@@ -131,10 +131,6 @@ typedef union
|
||||
# define EREMOTEIO 193
|
||||
# endif
|
||||
|
||||
-# ifndef EUNATCH
|
||||
-# define EUNATCH 194
|
||||
-# endif
|
||||
-
|
||||
# ifndef ENOKEY
|
||||
# define ENOKEY 195
|
||||
# endif
|
||||
@@ -147,14 +143,6 @@ typedef union
|
||||
# define ETIME 197
|
||||
# endif
|
||||
|
||||
-# ifndef ENOSR
|
||||
-# define ENOSR 198
|
||||
-# endif
|
||||
-
|
||||
-# ifndef ENOSTR
|
||||
-# define ENOSTR 199
|
||||
-# endif
|
||||
-
|
||||
# ifndef EKEYREJECTED
|
||||
# define EKEYREJECTED 200
|
||||
# endif
|
||||
diff --git a/lib/common/results.c b/lib/common/results.c
|
||||
index 6d120694cd..96cd4e5659 100644
|
||||
--- a/lib/common/results.c
|
||||
+++ b/lib/common/results.c
|
||||
@@ -118,9 +118,6 @@ pcmk_strerror(int rc)
|
||||
case EREMOTEIO:
|
||||
return "Remote I/O error";
|
||||
/* coverity[dead_error_condition] False positive on non-Linux */
|
||||
- case EUNATCH:
|
||||
- return "Protocol driver not attached";
|
||||
- /* coverity[dead_error_condition] False positive on non-Linux */
|
||||
case ENOKEY:
|
||||
return "Required key not available";
|
||||
}
|
||||
@@ -342,8 +339,12 @@ pcmk_rc_name(int rc)
|
||||
case ENOMSG: return "ENOMSG";
|
||||
case ENOPROTOOPT: return "ENOPROTOOPT";
|
||||
case ENOSPC: return "ENOSPC";
|
||||
+#ifdef ENOSR
|
||||
case ENOSR: return "ENOSR";
|
||||
+#endif
|
||||
+#ifdef ENOSTR
|
||||
case ENOSTR: return "ENOSTR";
|
||||
+#endif
|
||||
case ENOSYS: return "ENOSYS";
|
||||
case ENOTBLK: return "ENOTBLK";
|
||||
case ENOTCONN: return "ENOTCONN";
|
||||
@@ -376,7 +377,9 @@ pcmk_rc_name(int rc)
|
||||
case ETIME: return "ETIME";
|
||||
case ETIMEDOUT: return "ETIMEDOUT";
|
||||
case ETXTBSY: return "ETXTBSY";
|
||||
+#ifdef EUNATCH
|
||||
case EUNATCH: return "EUNATCH";
|
||||
+#endif
|
||||
case EUSERS: return "EUSERS";
|
||||
/* case EWOULDBLOCK: return "EWOULDBLOCK"; */
|
||||
case EXDEV: return "EXDEV";
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From eac8d1ca51eac3f437e18584f7e013d976ecee2c Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Mon, 20 Dec 2021 15:33:12 -0600
|
||||
Subject: [PATCH 03/12] Log: libcrmcommon: improve handling of portability.h
|
||||
error codes
|
||||
|
||||
portability.h defines some system error codes that might not be present on
|
||||
non-Linux systems.
|
||||
|
||||
Define a constant for each one (for example, PCMK__ECOMM for ECOMM) when
|
||||
the system doesn't have the value, so we can detect that when relevant.
|
||||
|
||||
Also, make sure pcmk_rc_name() and pcmk_rc_str() handle all of these values.
|
||||
---
|
||||
include/portability.h | 8 ++++++++
|
||||
lib/common/results.c | 32 ++++++++++++++++++++++++++++++--
|
||||
2 files changed, 38 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/portability.h b/include/portability.h
|
||||
index ee065a376d..5d5fbf21cb 100644
|
||||
--- a/include/portability.h
|
||||
+++ b/include/portability.h
|
||||
@@ -116,34 +116,42 @@ typedef union
|
||||
# include <errno.h>
|
||||
|
||||
# ifndef ENOTUNIQ
|
||||
+# define PCMK__ENOTUNIQ
|
||||
# define ENOTUNIQ 190
|
||||
# endif
|
||||
|
||||
# ifndef ECOMM
|
||||
+# define PCMK__ECOMM
|
||||
# define ECOMM 191
|
||||
# endif
|
||||
|
||||
# ifndef ELIBACC
|
||||
+# define PCMK__ELIBACC
|
||||
# define ELIBACC 192
|
||||
# endif
|
||||
|
||||
# ifndef EREMOTEIO
|
||||
+# define PCMK__EREMOTIO
|
||||
# define EREMOTEIO 193
|
||||
# endif
|
||||
|
||||
# ifndef ENOKEY
|
||||
+# define PCMK__ENOKEY
|
||||
# define ENOKEY 195
|
||||
# endif
|
||||
|
||||
# ifndef ENODATA
|
||||
+# define PCMK__ENODATA
|
||||
# define ENODATA 196
|
||||
# endif
|
||||
|
||||
# ifndef ETIME
|
||||
+# define PCMK__ETIME
|
||||
# define ETIME 197
|
||||
# endif
|
||||
|
||||
# ifndef EKEYREJECTED
|
||||
+# define PCMK__EKEYREJECTED
|
||||
# define EKEYREJECTED 200
|
||||
# endif
|
||||
|
||||
diff --git a/lib/common/results.c b/lib/common/results.c
|
||||
index 96cd4e5659..bcf289d0d6 100644
|
||||
--- a/lib/common/results.c
|
||||
+++ b/lib/common/results.c
|
||||
@@ -395,9 +395,9 @@ pcmk_rc_name(int rc)
|
||||
#ifdef EISNAM // Not available on OS X, Illumos, Solaris
|
||||
case EISNAM: return "EISNAM";
|
||||
case EKEYEXPIRED: return "EKEYEXPIRED";
|
||||
- case EKEYREJECTED: return "EKEYREJECTED";
|
||||
case EKEYREVOKED: return "EKEYREVOKED";
|
||||
#endif
|
||||
+ case EKEYREJECTED: return "EKEYREJECTED";
|
||||
case EL2HLT: return "EL2HLT";
|
||||
case EL2NSYNC: return "EL2NSYNC";
|
||||
case EL3HLT: return "EL3HLT";
|
||||
@@ -443,7 +443,35 @@ pcmk_rc_str(int rc)
|
||||
if (rc < 0) {
|
||||
return "Unknown error";
|
||||
}
|
||||
- return strerror(rc);
|
||||
+
|
||||
+ // Handle values that could be defined by system or by portability.h
|
||||
+ switch (rc) {
|
||||
+#ifdef PCMK__ENOTUNIQ
|
||||
+ case ENOTUNIQ: return "Name not unique on network";
|
||||
+#endif
|
||||
+#ifdef PCMK__ECOMM
|
||||
+ case ECOMM: return "Communication error on send";
|
||||
+#endif
|
||||
+#ifdef PCMK__ELIBACC
|
||||
+ case ELIBACC: return "Can not access a needed shared library";
|
||||
+#endif
|
||||
+#ifdef PCMK__EREMOTEIO
|
||||
+ case EREMOTEIO: return "Remote I/O error";
|
||||
+#endif
|
||||
+#ifdef PCMK__ENOKEY
|
||||
+ case ENOKEY: return "Required key not available";
|
||||
+#endif
|
||||
+#ifdef PCMK__ENODATA
|
||||
+ case ENODATA: return "No data available";
|
||||
+#endif
|
||||
+#ifdef PCMK__ETIME
|
||||
+ case ETIME: return "Timer expired";
|
||||
+#endif
|
||||
+#ifdef PCMK__EKEYREJECTED
|
||||
+ case EKEYREJECTED: return "Key was rejected by service";
|
||||
+#endif
|
||||
+ default: return strerror(rc);
|
||||
+ }
|
||||
}
|
||||
|
||||
// This returns negative values for errors
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 32a38ac6374f85c43e7f4051f5e519822cc481e6 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Mon, 20 Dec 2021 15:39:19 -0600
|
||||
Subject: [PATCH 04/12] Log: libcrmcommon: redefine pcmk_strerror() in terms of
|
||||
pcmk_rc_str()
|
||||
|
||||
... to reduce code duplication. This causes minor differences in the string for
|
||||
a few values.
|
||||
---
|
||||
lib/common/results.c | 67 +-------------------------------------------
|
||||
1 file changed, 1 insertion(+), 66 deletions(-)
|
||||
|
||||
diff --git a/lib/common/results.c b/lib/common/results.c
|
||||
index bcf289d0d6..b2c6e8d553 100644
|
||||
--- a/lib/common/results.c
|
||||
+++ b/lib/common/results.c
|
||||
@@ -57,72 +57,7 @@ pcmk_errorname(int rc)
|
||||
const char *
|
||||
pcmk_strerror(int rc)
|
||||
{
|
||||
- if (rc == 0) {
|
||||
- return "OK";
|
||||
- }
|
||||
-
|
||||
- rc = abs(rc);
|
||||
-
|
||||
- // Of course rc > 0 ... unless someone passed INT_MIN as rc
|
||||
- if ((rc > 0) && (rc < PCMK_ERROR_OFFSET)) {
|
||||
- return strerror(rc);
|
||||
- }
|
||||
-
|
||||
- switch (rc) {
|
||||
- case pcmk_err_generic:
|
||||
- return "Generic Pacemaker error";
|
||||
- case pcmk_err_no_quorum:
|
||||
- return "Operation requires quorum";
|
||||
- case pcmk_err_schema_validation:
|
||||
- return "Update does not conform to the configured schema";
|
||||
- case pcmk_err_transform_failed:
|
||||
- return "Schema transform failed";
|
||||
- case pcmk_err_old_data:
|
||||
- return "Update was older than existing configuration";
|
||||
- case pcmk_err_diff_failed:
|
||||
- return "Application of an update diff failed";
|
||||
- case pcmk_err_diff_resync:
|
||||
- return "Application of an update diff failed, requesting a full refresh";
|
||||
- case pcmk_err_cib_modified:
|
||||
- return "The on-disk configuration was manually modified";
|
||||
- case pcmk_err_cib_backup:
|
||||
- return "Could not archive the previous configuration";
|
||||
- case pcmk_err_cib_save:
|
||||
- return "Could not save the new configuration to disk";
|
||||
- case pcmk_err_cib_corrupt:
|
||||
- return "Could not parse on-disk configuration";
|
||||
- case pcmk_err_multiple:
|
||||
- return "Resource active on multiple nodes";
|
||||
- case pcmk_err_node_unknown:
|
||||
- return "Node not found";
|
||||
- case pcmk_err_already:
|
||||
- return "Situation already as requested";
|
||||
- case pcmk_err_bad_nvpair:
|
||||
- return "Bad name/value pair given";
|
||||
- case pcmk_err_schema_unchanged:
|
||||
- return "Schema is already the latest available";
|
||||
- case pcmk_err_unknown_format:
|
||||
- return "Unknown output format";
|
||||
-
|
||||
- /* The following cases will only be hit on systems for which they are non-standard */
|
||||
- /* coverity[dead_error_condition] False positive on non-Linux */
|
||||
- case ENOTUNIQ:
|
||||
- return "Name not unique on network";
|
||||
- /* coverity[dead_error_condition] False positive on non-Linux */
|
||||
- case ECOMM:
|
||||
- return "Communication error on send";
|
||||
- /* coverity[dead_error_condition] False positive on non-Linux */
|
||||
- case ELIBACC:
|
||||
- return "Can not access a needed shared library";
|
||||
- /* coverity[dead_error_condition] False positive on non-Linux */
|
||||
- case EREMOTEIO:
|
||||
- return "Remote I/O error";
|
||||
- /* coverity[dead_error_condition] False positive on non-Linux */
|
||||
- case ENOKEY:
|
||||
- return "Required key not available";
|
||||
- }
|
||||
- crm_err("Unknown error code: %d", rc);
|
||||
- return "Unknown error";
|
||||
+ return pcmk_rc_str(pcmk_legacy2rc(rc));
|
||||
}
|
||||
|
||||
// Standard Pacemaker API return codes
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 7c331d7e2275ffebbfd5e2f6432a6137a66ee5db Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Mon, 20 Dec 2021 15:41:24 -0600
|
||||
Subject: [PATCH 05/12] Log: libcrmcommon: don't say "Unknown error"
|
||||
|
||||
... which is unhelpful and annoying to users
|
||||
---
|
||||
lib/common/results.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/common/results.c b/lib/common/results.c
|
||||
index b2c6e8d553..5ffac76549 100644
|
||||
--- a/lib/common/results.c
|
||||
+++ b/lib/common/results.c
|
||||
@@ -376,7 +376,7 @@ pcmk_rc_str(int rc)
|
||||
return pcmk__rcs[pcmk_rc_error - rc].desc;
|
||||
}
|
||||
if (rc < 0) {
|
||||
- return "Unknown error";
|
||||
+ return "Error";
|
||||
}
|
||||
|
||||
// Handle values that could be defined by system or by portability.h
|
||||
@@ -768,7 +768,7 @@ bz2_strerror(int rc)
|
||||
case BZ_OUTBUFF_FULL:
|
||||
return "output data will not fit into the buffer provided";
|
||||
}
|
||||
- return "Unknown error";
|
||||
+ return "Data compression error";
|
||||
}
|
||||
|
||||
crm_exit_t
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 26883b4edda7d81bfcb79bd7b33bb3210beff110 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Mon, 20 Dec 2021 16:01:39 -0600
|
||||
Subject: [PATCH 06/12] Log: fencing: don't warn if cluster has no watchdog
|
||||
device
|
||||
|
||||
---
|
||||
lib/fencing/st_client.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
|
||||
index b1de912b2a..a0f3119f3b 100644
|
||||
--- a/lib/fencing/st_client.c
|
||||
+++ b/lib/fencing/st_client.c
|
||||
@@ -187,7 +187,12 @@ stonith__watchdog_fencing_enabled_for_node_api(stonith_t *st, const char *node)
|
||||
* we drop in here - so as not to make remote nodes
|
||||
* panic on that answer
|
||||
*/
|
||||
- crm_warn("watchdog-fencing-query failed");
|
||||
+ if (rc == -ENODEV) {
|
||||
+ crm_notice("Cluster does not have watchdog fencing device");
|
||||
+ } else {
|
||||
+ crm_warn("Could not check for watchdog fencing device: %s",
|
||||
+ pcmk_strerror(rc));
|
||||
+ }
|
||||
} else if (list[0] == '\0') {
|
||||
rv = TRUE;
|
||||
} else {
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 72b3c42232deaca64ffba9582598c59331203761 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Mon, 20 Dec 2021 16:22:49 -0600
|
||||
Subject: [PATCH 07/12] Test: libcrmcommon: update pcmk_rc_str() unit test for
|
||||
recent change
|
||||
|
||||
---
|
||||
lib/common/tests/results/pcmk__results_test.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/common/tests/results/pcmk__results_test.c b/lib/common/tests/results/pcmk__results_test.c
|
||||
index 57a520c501..e08d4b6261 100644
|
||||
--- a/lib/common/tests/results/pcmk__results_test.c
|
||||
+++ b/lib/common/tests/results/pcmk__results_test.c
|
||||
@@ -30,7 +30,7 @@ static void
|
||||
test_for_pcmk_rc_str(void **state) {
|
||||
assert_string_equal(pcmk_rc_str(pcmk_rc_error-1), "Unknown output format");
|
||||
assert_string_equal(pcmk_rc_str(pcmk_rc_ok), "OK");
|
||||
- assert_string_equal(pcmk_rc_str(-1), "Unknown error");
|
||||
+ assert_string_equal(pcmk_rc_str(-1), "Error");
|
||||
}
|
||||
|
||||
static void
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From c1ad3d6640f695321a83183c95fae2f105adc429 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 21 Dec 2021 10:20:38 -0600
|
||||
Subject: [PATCH 08/12] Test: cts-lab: update expected patterns for recent
|
||||
changes
|
||||
|
||||
---
|
||||
cts/lab/CTStests.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cts/lab/CTStests.py b/cts/lab/CTStests.py
|
||||
index 62c832eb45..f4be998cfb 100644
|
||||
--- a/cts/lab/CTStests.py
|
||||
+++ b/cts/lab/CTStests.py
|
||||
@@ -3055,7 +3055,7 @@ class RemoteStonithd(RemoteDriver):
|
||||
r"pacemaker-controld.*:\s+error.*: Operation remote-.*_monitor",
|
||||
r"pacemaker-controld.*:\s+error.*: Result of monitor operation for remote-.*",
|
||||
r"schedulerd.*:\s+Recover remote-.*\s*\(.*\)",
|
||||
- r"error: Result of monitor operation for .* on remote-.*: No executor connection",
|
||||
+ r"error: Result of monitor operation for .* on remote-.*: Internal communication failure",
|
||||
]
|
||||
|
||||
ignore_pats.extend(RemoteDriver.errorstoignore(self))
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From f272e2f526633c707e894b39c7c7bce3c14de898 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 21 Dec 2021 15:40:49 -0600
|
||||
Subject: [PATCH 09/12] Log: controller,libpacemaker: make history XML creation
|
||||
less chatty
|
||||
|
||||
Other messages with the same info will already be logged at higher severity
|
||||
---
|
||||
daemons/controld/controld_execd.c | 3 +--
|
||||
daemons/controld/controld_te_actions.c | 7 ++-----
|
||||
include/pcmki/pcmki_sched_utils.h | 3 +--
|
||||
lib/pacemaker/pcmk_injections.c | 3 +--
|
||||
lib/pacemaker/pcmk_sched_actions.c | 12 +++++-------
|
||||
5 files changed, 10 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/daemons/controld/controld_execd.c b/daemons/controld/controld_execd.c
|
||||
index 15784e7687..52157fa5d4 100644
|
||||
--- a/daemons/controld/controld_execd.c
|
||||
+++ b/daemons/controld/controld_execd.c
|
||||
@@ -693,9 +693,8 @@ build_operation_update(xmlNode * parent, lrmd_rsc_info_t * rsc, lrmd_event_data_
|
||||
caller_version = CRM_FEATURE_SET;
|
||||
}
|
||||
|
||||
- crm_trace("Building %s operation update with originator version: %s", op->rsc_id, caller_version);
|
||||
xml_op = pcmk__create_history_xml(parent, op, caller_version, target_rc,
|
||||
- fsa_our_uname, src, LOG_DEBUG);
|
||||
+ fsa_our_uname, src);
|
||||
if (xml_op == NULL) {
|
||||
return TRUE;
|
||||
}
|
||||
diff --git a/daemons/controld/controld_te_actions.c b/daemons/controld/controld_te_actions.c
|
||||
index 63b7c72359..b0bcb8b2e4 100644
|
||||
--- a/daemons/controld/controld_te_actions.c
|
||||
+++ b/daemons/controld/controld_te_actions.c
|
||||
@@ -181,7 +181,6 @@ controld_record_action_timeout(crm_action_t *action)
|
||||
lrmd_event_data_t *op = NULL;
|
||||
xmlNode *state = NULL;
|
||||
xmlNode *rsc = NULL;
|
||||
- xmlNode *xml_op = NULL;
|
||||
xmlNode *action_rsc = NULL;
|
||||
|
||||
int rc = pcmk_ok;
|
||||
@@ -245,12 +244,10 @@ controld_record_action_timeout(crm_action_t *action)
|
||||
op->user_data = pcmk__transition_key(transition_graph->id, action->id,
|
||||
target_rc, te_uuid);
|
||||
|
||||
- xml_op = pcmk__create_history_xml(rsc, op, CRM_FEATURE_SET, target_rc,
|
||||
- target, __func__, LOG_INFO);
|
||||
+ pcmk__create_history_xml(rsc, op, CRM_FEATURE_SET, target_rc, target,
|
||||
+ __func__);
|
||||
lrmd_free_event(op);
|
||||
|
||||
- crm_log_xml_trace(xml_op, "Action timeout");
|
||||
-
|
||||
rc = fsa_cib_conn->cmds->update(fsa_cib_conn, XML_CIB_TAG_STATUS, state, call_options);
|
||||
fsa_register_cib_callback(rc, FALSE, NULL, cib_action_updated);
|
||||
free_xml(state);
|
||||
diff --git a/include/pcmki/pcmki_sched_utils.h b/include/pcmki/pcmki_sched_utils.h
|
||||
index 68d60fc7db..144424a609 100644
|
||||
--- a/include/pcmki/pcmki_sched_utils.h
|
||||
+++ b/include/pcmki/pcmki_sched_utils.h
|
||||
@@ -52,8 +52,7 @@ extern void process_utilization(pe_resource_t * rsc, pe_node_t ** prefer, pe_wor
|
||||
|
||||
xmlNode *pcmk__create_history_xml(xmlNode *parent, lrmd_event_data_t *event,
|
||||
const char *caller_version, int target_rc,
|
||||
- const char *node, const char *origin,
|
||||
- int level);
|
||||
+ const char *node, const char *origin);
|
||||
|
||||
# define LOAD_STOPPED "load_stopped"
|
||||
|
||||
diff --git a/lib/pacemaker/pcmk_sched_transition.c b/lib/pacemaker/pcmk_sched_transition.c
|
||||
index 678c3f5dd2..1aa90a5a0b 100644
|
||||
--- a/lib/pacemaker/pcmk_sched_transition.c
|
||||
+++ b/lib/pacemaker/pcmk_sched_transition.c
|
||||
@@ -201,8 +201,7 @@ inject_op(xmlNode * cib_resource, lrmd_event_data_t * op, int target_rc)
|
||||
inject_op(xmlNode * cib_resource, lrmd_event_data_t * op, int target_rc)
|
||||
{
|
||||
return pcmk__create_history_xml(cib_resource, op, CRM_FEATURE_SET,
|
||||
- target_rc, NULL, crm_system_name,
|
||||
- LOG_TRACE);
|
||||
+ target_rc, NULL, crm_system_name);
|
||||
}
|
||||
|
||||
static xmlNode *
|
||||
diff --git a/lib/pacemaker/pcmk_sched_actions.c b/lib/pacemaker/pcmk_sched_actions.c
|
||||
index f8200b0efc..4f63d3374d 100644
|
||||
--- a/lib/pacemaker/pcmk_sched_utils.c
|
||||
+++ b/lib/pacemaker/pcmk_sched_utils.c
|
||||
@@ -892,14 +892,13 @@ add_op_digest_to_xml(lrmd_event_data_t *op, xmlNode *update)
|
||||
* \param[in] target_rc Expected result of operation
|
||||
* \param[in] node Name of node on which operation was performed
|
||||
* \param[in] origin Arbitrary description of update source
|
||||
- * \param[in] level A log message will be logged at this level
|
||||
*
|
||||
* \return Newly created XML node for history update
|
||||
*/
|
||||
xmlNode *
|
||||
pcmk__create_history_xml(xmlNode *parent, lrmd_event_data_t *op,
|
||||
const char *caller_version, int target_rc,
|
||||
- const char *node, const char *origin, int level)
|
||||
+ const char *node, const char *origin)
|
||||
{
|
||||
char *key = NULL;
|
||||
char *magic = NULL;
|
||||
@@ -912,11 +911,10 @@ pcmk__create_history_xml(xmlNode *parent, lrmd_event_data_t *op,
|
||||
const char *task = NULL;
|
||||
|
||||
CRM_CHECK(op != NULL, return NULL);
|
||||
- do_crm_log(level, "%s: Updating resource %s after %s op %s (interval=%u)",
|
||||
- origin, op->rsc_id, op->op_type,
|
||||
- pcmk_exec_status_str(op->op_status), op->interval_ms);
|
||||
-
|
||||
- crm_trace("DC version: %s", caller_version);
|
||||
+ crm_trace("Creating history XML for %s-interval %s action for %s on %s "
|
||||
+ "(DC version: %s, origin: %s)",
|
||||
+ pcmk__readable_interval(op->interval_ms), op->op_type, op->rsc_id,
|
||||
+ ((node == NULL)? "no node" : node), caller_version, origin);
|
||||
|
||||
task = op->op_type;
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 06b1da9e5345e0d1571042c11646fd7157961279 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Tue, 21 Dec 2021 17:09:44 -0600
|
||||
Subject: [PATCH 10/12] Feature: controller: improve exit reason for internal
|
||||
timeouts
|
||||
|
||||
Functionize the part of controld_record_action_timeout() that creates a fake
|
||||
executor event, into a new function synthesize_timeout_event(), and have it set
|
||||
a more detailed exit reason describing what timed out.
|
||||
---
|
||||
daemons/controld/controld_te_actions.c | 61 ++++++++++++++++++++------
|
||||
1 file changed, 48 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/daemons/controld/controld_te_actions.c b/daemons/controld/controld_te_actions.c
|
||||
index b0bcb8b2e4..de2fbb82bf 100644
|
||||
--- a/daemons/controld/controld_te_actions.c
|
||||
+++ b/daemons/controld/controld_te_actions.c
|
||||
@@ -175,6 +175,53 @@ te_crm_command(crm_graph_t * graph, crm_action_t * action)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+/*!
|
||||
+ * \internal
|
||||
+ * \brief Synthesize an executor event for a resource action timeout
|
||||
+ *
|
||||
+ * \param[in] action Resource action that timed out
|
||||
+ * \param[in] target_rc Expected result of action that timed out
|
||||
+ *
|
||||
+ * Synthesize an executor event for a resource action timeout. (If the executor
|
||||
+ * gets a timeout while waiting for a resource action to complete, that will be
|
||||
+ * reported via the usual callback. This timeout means we didn't hear from the
|
||||
+ * executor itself or the controller that relayed the action to the executor.)
|
||||
+ *
|
||||
+ * \return Newly created executor event for result of \p action
|
||||
+ * \note The caller is responsible for freeing the return value using
|
||||
+ * lrmd_free_event().
|
||||
+ */
|
||||
+static lrmd_event_data_t *
|
||||
+synthesize_timeout_event(crm_action_t *action, int target_rc)
|
||||
+{
|
||||
+ lrmd_event_data_t *op = NULL;
|
||||
+ const char *target = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
|
||||
+ const char *reason = NULL;
|
||||
+ char *dynamic_reason = NULL;
|
||||
+
|
||||
+ if (pcmk__str_eq(target, get_local_node_name(), pcmk__str_casei)) {
|
||||
+ reason = "Local executor did not return result in time";
|
||||
+ } else {
|
||||
+ const char *router_node = NULL;
|
||||
+
|
||||
+ router_node = crm_element_value(action->xml, XML_LRM_ATTR_ROUTER_NODE);
|
||||
+ if (router_node == NULL) {
|
||||
+ router_node = target;
|
||||
+ }
|
||||
+ dynamic_reason = crm_strdup_printf("Controller on %s did not return "
|
||||
+ "result in time", router_node);
|
||||
+ reason = dynamic_reason;
|
||||
+ }
|
||||
+
|
||||
+ op = pcmk__event_from_graph_action(NULL, action, PCMK_EXEC_TIMEOUT,
|
||||
+ PCMK_OCF_UNKNOWN_ERROR, reason);
|
||||
+ op->call_id = -1;
|
||||
+ op->user_data = pcmk__transition_key(transition_graph->id, action->id,
|
||||
+ target_rc, te_uuid);
|
||||
+ free(dynamic_reason);
|
||||
+ return op;
|
||||
+}
|
||||
+
|
||||
void
|
||||
controld_record_action_timeout(crm_action_t *action)
|
||||
{
|
||||
@@ -231,19 +278,7 @@ controld_record_action_timeout(crm_action_t *action)
|
||||
crm_copy_xml_element(action_rsc, rsc, XML_AGENT_ATTR_CLASS);
|
||||
crm_copy_xml_element(action_rsc, rsc, XML_AGENT_ATTR_PROVIDER);
|
||||
|
||||
- /* If the executor gets a timeout while waiting for the action to complete,
|
||||
- * that will be reported via the usual callback. This timeout means that we
|
||||
- * didn't hear from the executor or the controller that relayed the action
|
||||
- * to the executor.
|
||||
- */
|
||||
- op = pcmk__event_from_graph_action(NULL, action, PCMK_EXEC_TIMEOUT,
|
||||
- PCMK_OCF_UNKNOWN_ERROR,
|
||||
- "Cluster communication timeout "
|
||||
- "(no response from executor)");
|
||||
- op->call_id = -1;
|
||||
- op->user_data = pcmk__transition_key(transition_graph->id, action->id,
|
||||
- target_rc, te_uuid);
|
||||
-
|
||||
+ op = synthesize_timeout_event(action, target_rc);
|
||||
pcmk__create_history_xml(rsc, op, CRM_FEATURE_SET, target_rc, target,
|
||||
__func__);
|
||||
lrmd_free_event(op);
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From be620d206faefab967d4c8567d6554d10c9e72ba Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Wed, 22 Dec 2021 16:35:06 -0600
|
||||
Subject: [PATCH 11/12] Feature: fencing: improve exit reason for fencing
|
||||
timeouts
|
||||
|
||||
Troubleshooting timeouts is one of the more difficult aspects of cluster
|
||||
maintenance. We want to give as much of a hint as possible, but for fencing in
|
||||
particular it is difficult because an operation might involve multiple retries
|
||||
of multiple devices.
|
||||
|
||||
Barring another major project to track exactly which devices, retries, etc.,
|
||||
were used in a given operation, these changes in wording are probably the best
|
||||
we can do.
|
||||
---
|
||||
daemons/fenced/fenced_remote.c | 8 +++++---
|
||||
lib/fencing/st_client.c | 2 +-
|
||||
2 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/daemons/fenced/fenced_remote.c b/daemons/fenced/fenced_remote.c
|
||||
index 1e237150c5..6eebb7381e 100644
|
||||
--- a/daemons/fenced/fenced_remote.c
|
||||
+++ b/daemons/fenced/fenced_remote.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright 2009-2021 the Pacemaker project contributors
|
||||
+ * Copyright 2009-2022 the Pacemaker project contributors
|
||||
*
|
||||
* The version control history for this file may have further details.
|
||||
*
|
||||
@@ -715,8 +715,10 @@ remote_op_timeout(gpointer userdata)
|
||||
CRM_XS " id=%.8s",
|
||||
op->action, op->target, op->client_name, op->id);
|
||||
} else {
|
||||
- finalize_timed_out_op(userdata, "Fencing could not be completed "
|
||||
- "within overall timeout");
|
||||
+ finalize_timed_out_op(userdata, "Fencing did not complete within a "
|
||||
+ "total timeout based on the "
|
||||
+ "configured timeout and retries for "
|
||||
+ "any devices attempted");
|
||||
}
|
||||
return G_SOURCE_REMOVE;
|
||||
}
|
||||
diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
|
||||
index a0f3119f3b..718739b321 100644
|
||||
--- a/lib/fencing/st_client.c
|
||||
+++ b/lib/fencing/st_client.c
|
||||
@@ -906,7 +906,7 @@ invoke_registered_callbacks(stonith_t *stonith, xmlNode *msg, int call_id)
|
||||
if (msg == NULL) {
|
||||
// Fencer didn't reply in time
|
||||
pcmk__set_result(&result, CRM_EX_ERROR, PCMK_EXEC_TIMEOUT,
|
||||
- "Timeout waiting for reply from fencer");
|
||||
+ "Fencer accepted request but did not reply in time");
|
||||
CRM_LOG_ASSERT(call_id > 0);
|
||||
|
||||
} else {
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
From 0fe8ede2f8e838e335fe42846bdf147111ce9955 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Wed, 22 Dec 2021 17:09:09 -0600
|
||||
Subject: [PATCH 12/12] Feature: libcrmservice: improve exit reason for
|
||||
timeouts
|
||||
|
||||
The services library doesn't have enough information about an action to say
|
||||
(for example) what configuration parameters might be relevant, but we can at
|
||||
least distinguish what kind of agent timed out.
|
||||
---
|
||||
lib/services/services_linux.c | 12 +++++++++++-
|
||||
lib/services/systemd.c | 2 +-
|
||||
2 files changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/services/services_linux.c b/lib/services/services_linux.c
|
||||
index f15eee860e..d6aafcfe46 100644
|
||||
--- a/lib/services/services_linux.c
|
||||
+++ b/lib/services/services_linux.c
|
||||
@@ -677,9 +677,19 @@ async_action_complete(mainloop_child_t *p, pid_t pid, int core, int signo,
|
||||
parse_exit_reason_from_stderr(op);
|
||||
|
||||
} else if (mainloop_child_timeout(p)) {
|
||||
+ const char *reason = NULL;
|
||||
+
|
||||
+ if (op->rsc != NULL) {
|
||||
+ reason = "Resource agent did not complete in time";
|
||||
+ } else if (pcmk__str_eq(op->standard, PCMK_RESOURCE_CLASS_STONITH,
|
||||
+ pcmk__str_none)) {
|
||||
+ reason = "Fence agent did not complete in time";
|
||||
+ } else {
|
||||
+ reason = "Process did not complete in time";
|
||||
+ }
|
||||
crm_info("%s[%d] timed out after %dms", op->id, op->pid, op->timeout);
|
||||
services__set_result(op, services__generic_error(op), PCMK_EXEC_TIMEOUT,
|
||||
- "Process did not exit within specified timeout");
|
||||
+ reason);
|
||||
|
||||
} else if (op->cancel) {
|
||||
/* If an in-flight recurring operation was killed because it was
|
||||
diff --git a/lib/services/systemd.c b/lib/services/systemd.c
|
||||
index 27a3b376db..d87b287424 100644
|
||||
--- a/lib/services/systemd.c
|
||||
+++ b/lib/services/systemd.c
|
||||
@@ -995,7 +995,7 @@ systemd_timeout_callback(gpointer p)
|
||||
crm_info("%s action for systemd unit %s named '%s' timed out",
|
||||
op->action, op->agent, op->rsc);
|
||||
services__set_result(op, PCMK_OCF_UNKNOWN_ERROR, PCMK_EXEC_TIMEOUT,
|
||||
- "Systemd action did not complete within specified timeout");
|
||||
+ "Systemd unit action did not complete in time");
|
||||
services__finalize_async_op(op);
|
||||
return FALSE;
|
||||
}
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From e8bf0161b872267f1bb7143a9866fdc15ec218f2 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Friesse <jfriesse@redhat.com>
|
||||
Date: Tue, 18 Jan 2022 16:35:24 +0100
|
||||
Subject: [PATCH] Fix: corosync: Repeat corosync_cfg_trackstart
|
||||
|
||||
corosync_cfg_trackstart can fail with CS_ERR_TRY_AGAIN failure so
|
||||
(similarly as for corosync_cfg_local_get, ...) handle failure with
|
||||
using cs_repeat macro.
|
||||
---
|
||||
daemons/pacemakerd/pcmkd_corosync.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/daemons/pacemakerd/pcmkd_corosync.c b/daemons/pacemakerd/pcmkd_corosync.c
|
||||
index 7990bc43c5..cd7a40321d 100644
|
||||
--- a/daemons/pacemakerd/pcmkd_corosync.c
|
||||
+++ b/daemons/pacemakerd/pcmkd_corosync.c
|
||||
@@ -186,7 +186,8 @@ cluster_connect_cfg(void)
|
||||
crm_debug("Corosync reports local node ID is %lu", (unsigned long) nodeid);
|
||||
|
||||
#ifdef HAVE_COROSYNC_CFG_TRACKSTART
|
||||
- rc = corosync_cfg_trackstart(cfg_handle, 0);
|
||||
+ retries = 0;
|
||||
+ cs_repeat(retries, 30, rc = corosync_cfg_trackstart(cfg_handle, 0));
|
||||
if (rc != CS_OK) {
|
||||
crm_crit("Could not enable Corosync CFG shutdown tracker: %s " CRM_XS " rc=%d",
|
||||
cs_strerror(rc), rc);
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
From e316840a7e1d2a72e3089ee194334244c959905a Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Wed, 19 Jan 2022 09:53:53 -0600
|
||||
Subject: [PATCH] Fix: pacemakerd: tweak systemd unit respawn settings
|
||||
|
||||
If pacemaker exits immediately after starting, wait 1 second before trying to
|
||||
respawn, since the default of 100ms is a bit aggressive for a Pacemaker
|
||||
cluster.
|
||||
|
||||
Also, allow 5 attempts in 25 seconds before giving up.
|
||||
---
|
||||
daemons/pacemakerd/pacemaker.service.in | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/daemons/pacemakerd/pacemaker.service.in b/daemons/pacemakerd/pacemaker.service.in
|
||||
index 0363a2259c..3fd53d9ffb 100644
|
||||
--- a/daemons/pacemakerd/pacemaker.service.in
|
||||
+++ b/daemons/pacemakerd/pacemaker.service.in
|
||||
@@ -31,6 +31,9 @@ After=rsyslog.service
|
||||
After=corosync.service
|
||||
Requires=corosync.service
|
||||
|
||||
+# If Pacemaker respawns repeatedly, give up after this many tries in this time
|
||||
+StartLimitBurst=5
|
||||
+StartLimitIntervalSec=25s
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -57,6 +60,9 @@ TasksMax=infinity
|
||||
# resource. Sending -KILL will just get the node fenced
|
||||
SendSIGKILL=no
|
||||
|
||||
+# Systemd's default of respawning a failed service after 100ms is too aggressive
|
||||
+RestartSec=1s
|
||||
+
|
||||
# If we ever hit the StartLimitInterval/StartLimitBurst limit, and the
|
||||
# admin wants to stop the cluster while pacemakerd is not running, it
|
||||
# might be a good idea to enable the ExecStopPost directive below.
|
||||
--
|
||||
2.27.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,82 +0,0 @@
|
|||
From 8034a203bbff0aa3b53f2946dc58e409bd7246c9 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
Date: Thu, 20 Jan 2022 15:03:31 -0600
|
||||
Subject: [PATCH] Fix: scheduler: avoid memory leak when displaying clones
|
||||
|
||||
Previously, pe__clone_default() unconditionally created a hash table for
|
||||
stopped instances, but didn't free it in every code path.
|
||||
|
||||
Now, only create the table when we have something to put in it and might
|
||||
actually use it, and ensure it always gets freed.
|
||||
---
|
||||
lib/pengine/clone.c | 18 +++++++++++++-----
|
||||
1 file changed, 13 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/lib/pengine/clone.c b/lib/pengine/clone.c
|
||||
index 742e2920b0..920a04c32c 100644
|
||||
--- a/lib/pengine/clone.c
|
||||
+++ b/lib/pengine/clone.c
|
||||
@@ -761,7 +761,7 @@ pe__clone_default(pcmk__output_t *out, va_list args)
|
||||
GList *only_node = va_arg(args, GList *);
|
||||
GList *only_rsc = va_arg(args, GList *);
|
||||
|
||||
- GHashTable *stopped = pcmk__strkey_table(free, free);
|
||||
+ GHashTable *stopped = NULL;
|
||||
|
||||
char *list_text = NULL;
|
||||
size_t list_text_len = 0;
|
||||
@@ -818,7 +818,11 @@ pe__clone_default(pcmk__output_t *out, va_list args)
|
||||
} else if (partially_active == FALSE) {
|
||||
// List stopped instances when requested (except orphans)
|
||||
if (!pcmk_is_set(child_rsc->flags, pe_rsc_orphan)
|
||||
+ && !pcmk_is_set(show_opts, pcmk_show_clone_detail)
|
||||
&& pcmk_is_set(show_opts, pcmk_show_inactive_rscs)) {
|
||||
+ if (stopped == NULL) {
|
||||
+ stopped = pcmk__strkey_table(free, free);
|
||||
+ }
|
||||
g_hash_table_insert(stopped, strdup(child_rsc->id), strdup("Stopped"));
|
||||
}
|
||||
|
||||
@@ -873,7 +877,6 @@ pe__clone_default(pcmk__output_t *out, va_list args)
|
||||
}
|
||||
|
||||
if (pcmk_is_set(show_opts, pcmk_show_clone_detail)) {
|
||||
- g_hash_table_destroy(stopped);
|
||||
PCMK__OUTPUT_LIST_FOOTER(out, rc);
|
||||
return pcmk_rc_ok;
|
||||
}
|
||||
@@ -948,8 +951,10 @@ pe__clone_default(pcmk__output_t *out, va_list args)
|
||||
GList *list = g_hash_table_get_values(rsc->allowed_nodes);
|
||||
|
||||
/* Custom stopped table for non-unique clones */
|
||||
- g_hash_table_destroy(stopped);
|
||||
- stopped = pcmk__strkey_table(free, free);
|
||||
+ if (stopped != NULL) {
|
||||
+ g_hash_table_destroy(stopped);
|
||||
+ stopped = NULL;
|
||||
+ }
|
||||
|
||||
if (list == NULL) {
|
||||
/* Clusters with symmetrical=false haven't calculated allowed_nodes yet
|
||||
@@ -972,6 +977,9 @@ pe__clone_default(pcmk__output_t *out, va_list args)
|
||||
state = "Stopped (disabled)";
|
||||
}
|
||||
|
||||
+ if (stopped == NULL) {
|
||||
+ stopped = pcmk__strkey_table(free, free);
|
||||
+ }
|
||||
if (probe_op != NULL) {
|
||||
int rc;
|
||||
|
||||
@@ -987,7 +995,7 @@ pe__clone_default(pcmk__output_t *out, va_list args)
|
||||
g_list_free(list);
|
||||
}
|
||||
|
||||
- if (g_hash_table_size(stopped) > 0) {
|
||||
+ if (stopped != NULL) {
|
||||
GList *list = sorted_hash_table_values(stopped);
|
||||
|
||||
clone_header(out, &rc, rsc, clone_data);
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -35,19 +35,15 @@
|
|||
## Upstream pacemaker version, and its package version (specversion
|
||||
## can be incremented to build packages reliably considered "newer"
|
||||
## than previously built packages with the same pcmkversion)
|
||||
%global pcmkversion 2.1.2
|
||||
%global specversion 3
|
||||
%global pcmkversion 2.1.7
|
||||
%global specversion 5
|
||||
|
||||
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
|
||||
%global commit ada5c3b36e2adf1703d54d39f40a4b8628eca175
|
||||
%global commit 0f7f88312f7a1ccedee60bf768aba79ee13d41e0
|
||||
|
||||
## Since git v2.11, the extent of abbreviation is autoscaled by default
|
||||
## (used to be constant of 7), so we need to convey it for non-tags, too.
|
||||
%if (0%{?fedora} >= 26) || (0%{?rhel} >= 9)
|
||||
%global commit_abbrev 9
|
||||
%else
|
||||
%global commit_abbrev 7
|
||||
%endif
|
||||
|
||||
## Nagios source control identifiers
|
||||
%global nagios_name nagios-agents-metadata
|
||||
|
|
@ -63,14 +59,13 @@
|
|||
## Add option for whether to support storing sensitive information outside CIB
|
||||
%bcond_without cibsecrets
|
||||
|
||||
## Add option to enable Native Language Support (experimental)
|
||||
%bcond_with nls
|
||||
|
||||
## Add option to create binaries suitable for use with profiling tools
|
||||
%bcond_with profiling
|
||||
|
||||
## Add option to create binaries with coverage analysis
|
||||
%bcond_with coverage
|
||||
|
||||
## Add option to skip (or enable, on RHEL) generating documentation
|
||||
## (the build tools aren't available everywhere)
|
||||
## Allow deprecated option to skip (or enable, on RHEL) documentation
|
||||
%if 0%{?rhel}
|
||||
%bcond_with doc
|
||||
%else
|
||||
|
|
@ -118,9 +113,14 @@
|
|||
%define archive_version %(c=%{commit}; echo ${c:10})
|
||||
%define archive_github_url %{commit}#/%{name}-%{archive_version}.tar.gz
|
||||
%else
|
||||
%if "%{commit}" == "DIST"
|
||||
%define archive_version %{pcmkversion}
|
||||
%define archive_github_url %{archive_version}#/%{name}-%{pcmkversion}.tar.gz
|
||||
%else
|
||||
%define archive_version %(c=%{commit}; echo ${c:0:%{commit_abbrev}})
|
||||
%define archive_github_url %{archive_version}#/%{name}-%{archive_version}.tar.gz
|
||||
%endif
|
||||
%endif
|
||||
### Always use a simple release number
|
||||
%define pcmk_release %{specversion}
|
||||
|
||||
|
|
@ -159,6 +159,7 @@
|
|||
%if 0%{?suse_version} > 0
|
||||
%global pkgname_bzip2_devel libbz2-devel
|
||||
%global pkgname_docbook_xsl docbook-xsl-stylesheets
|
||||
%global pkgname_gettext gettext-tools
|
||||
%global pkgname_gnutls_devel libgnutls-devel
|
||||
%global pkgname_shadow_utils shadow
|
||||
%global pkgname_procps procps
|
||||
|
|
@ -170,6 +171,7 @@
|
|||
%global pkgname_libtool_devel_arch libtool-ltdl-devel%{?_isa}
|
||||
%global pkgname_bzip2_devel bzip2-devel
|
||||
%global pkgname_docbook_xsl docbook-style-xsl
|
||||
%global pkgname_gettext gettext-devel
|
||||
%global pkgname_gnutls_devel gnutls-devel
|
||||
%global pkgname_shadow_utils shadow-utils
|
||||
%global pkgname_procps procps-ng
|
||||
|
|
@ -244,10 +246,10 @@ Summary: Scalable High-Availability cluster resource manager
|
|||
Version: %{pcmkversion}
|
||||
Release: %{pcmk_release}%{?dist}
|
||||
%if %{defined _unitdir}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
%else
|
||||
# initscript is Revised BSD
|
||||
License: GPLv2+ and LGPLv2+ and BSD
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause
|
||||
%endif
|
||||
Url: https://www.clusterlabs.org/
|
||||
|
||||
|
|
@ -263,36 +265,24 @@ Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{arch
|
|||
Source1: nagios-agents-metadata-%{nagios_hash}.tar.gz
|
||||
|
||||
# upstream commits
|
||||
Patch1: 001-acl-group-schema.patch
|
||||
Patch2: 002-fencing-reasons.patch
|
||||
Patch3: 003-fencing-reasons.patch
|
||||
Patch4: 004-systemd-metadata.patch
|
||||
Patch5: 005-fencing-reasons.patch
|
||||
Patch6: 006-stateful-metadata.patch
|
||||
Patch7: 007-memory-leak.patch
|
||||
Patch8: 008-fencing-history.patch
|
||||
Patch9: 009-fencing-reasons.patch
|
||||
Patch10: 010-probe-failures.patch
|
||||
Patch11: 011-fencing-reasons.patch
|
||||
Patch12: 012-notify-crash.patch
|
||||
Patch13: 013-probe-failures.patch
|
||||
Patch14: 014-pcmk_delay_base.patch
|
||||
Patch15: 015-fencing-reasons.patch
|
||||
Patch16: 016-fencing-crash.patch
|
||||
Patch17: 017-fencing-reasons.patch
|
||||
Patch18: 018-failure-messages.patch
|
||||
Patch19: 019-corosync-tracking.patch
|
||||
Patch20: 020-systemd-unit.patch
|
||||
Patch21: 021-failure-messages.patch
|
||||
Patch22: 022-memory-leak.patch
|
||||
|
||||
# downstream-only commits
|
||||
#Patch1xx: 1xx-xxxx.patch
|
||||
Patch001: 001-schema-glib.patch
|
||||
Patch002: 002-schema-transfer.patch
|
||||
Patch003: 003-schema-doc.patch
|
||||
Patch004: 004-attrd-cache-1.patch
|
||||
Patch005: 005-attrd-cache-2.patch
|
||||
Patch006: 006-cib-file-feature-set.patch
|
||||
Patch007: 007-option-metadata.patch
|
||||
Patch008: 008-attrd-prep.patch
|
||||
Patch009: 009-attrd-cache-3.patch
|
||||
Patch010: 010-crm_attribute-free.patch
|
||||
|
||||
Requires: resource-agents
|
||||
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-cluster-libs%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-cli = %{version}-%{release}
|
||||
%if %{with stonithd}
|
||||
Requires: %{python_name}-%{name} = %{version}-%{release}
|
||||
%endif
|
||||
%if !%{defined _unitdir}
|
||||
Requires: %{pkgname_procps}
|
||||
Requires: psmisc
|
||||
|
|
@ -309,6 +299,7 @@ ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
|
|||
|
||||
Requires: %{python_path}
|
||||
BuildRequires: %{python_name}-devel
|
||||
BuildRequires: %{python_name}-setuptools
|
||||
|
||||
# Pacemaker requires a minimum libqb functionality
|
||||
Requires: libqb >= 0.17.0
|
||||
|
|
@ -331,7 +322,7 @@ BuildRequires: sed
|
|||
|
||||
# Required for core functionality
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.42
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libxml2-devel >= 2.6.0
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: %{pkgname_bzip2_devel}
|
||||
|
|
@ -343,9 +334,10 @@ BuildRequires: %{pkgname_gnutls_devel}
|
|||
BuildRequires: help2man
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: %{pkgname_gettext} >= 0.18
|
||||
|
||||
# Required for "make check"
|
||||
BuildRequires: libcmocka-devel
|
||||
BuildRequires: libcmocka-devel >= 1.1.0
|
||||
|
||||
%if %{systemd_native}
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
|
|
@ -370,6 +362,9 @@ BuildRequires: inkscape
|
|||
BuildRequires: %{python_name}-sphinx
|
||||
%endif
|
||||
|
||||
# Booth requires this
|
||||
Provides: pacemaker-ticket-support = 2.0
|
||||
|
||||
Provides: pcmk-cluster-manager = %{version}-%{release}
|
||||
Provides: pcmk-cluster-manager%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
|
@ -391,10 +386,11 @@ when related resources fail and can be configured to periodically check
|
|||
resource health.
|
||||
|
||||
Available rpmbuild rebuild options:
|
||||
--with(out) : cibsecrets coverage doc hardening pre_release profiling stonithd
|
||||
--with(out) : cibsecrets hardening nls pre_release profiling
|
||||
stonithd
|
||||
|
||||
%package cli
|
||||
License: GPLv2+ and LGPLv2+
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
Summary: Command line tools for controlling Pacemaker clusters
|
||||
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
|
||||
# For crm_report
|
||||
|
|
@ -414,14 +410,14 @@ to query and control the cluster from machines that may, or may not,
|
|||
be part of the cluster.
|
||||
|
||||
%package -n %{pkgname_pcmk_libs}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
Summary: Core Pacemaker libraries
|
||||
Requires(pre): %{pkgname_shadow_utils}
|
||||
Requires: %{name}-schemas = %{version}-%{release}
|
||||
# sbd 1.4.0+ supports the libpe_status API for pe_working_set_t
|
||||
# sbd 1.4.2+ supports startup/shutdown handshake via pacemakerd-api
|
||||
# and handshake defaults to enabled in this spec
|
||||
Conflicts: sbd < 1.4.2
|
||||
# sbd 1.5.0+ supports handshake defaults to enabled in this spec
|
||||
Conflicts: sbd < 1.5.0
|
||||
|
||||
%description -n %{pkgname_pcmk_libs}
|
||||
Pacemaker is an advanced, scalable High-Availability cluster resource
|
||||
|
|
@ -431,7 +427,7 @@ The %{pkgname_pcmk_libs} package contains shared libraries needed for cluster
|
|||
nodes and those just running the CLI tools.
|
||||
|
||||
%package cluster-libs
|
||||
License: GPLv2+ and LGPLv2+
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
Summary: Cluster Libraries used by Pacemaker
|
||||
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
|
@ -442,12 +438,26 @@ manager.
|
|||
The %{name}-cluster-libs package contains cluster-aware shared
|
||||
libraries needed for nodes that will form part of the cluster nodes.
|
||||
|
||||
%package -n %{python_name}-%{name}
|
||||
License: LGPL-2.1-or-later
|
||||
Summary: Python libraries for Pacemaker
|
||||
Requires: %{python_path}
|
||||
Requires: %{pkgname_pcmk_libs} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n %{python_name}-%{name}
|
||||
Pacemaker is an advanced, scalable High-Availability cluster resource
|
||||
manager.
|
||||
|
||||
The %{python_name}-%{name} package contains a Python library that can be used
|
||||
to interface with Pacemaker.
|
||||
|
||||
%package remote
|
||||
%if %{defined _unitdir}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
%else
|
||||
# initscript is Revised BSD
|
||||
License: GPLv2+ and LGPLv2+ and BSD
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause
|
||||
%endif
|
||||
Summary: Pacemaker remote executor daemon for non-cluster nodes
|
||||
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
|
||||
|
|
@ -470,7 +480,7 @@ which is capable of extending pacemaker functionality to remote
|
|||
nodes not running the full corosync/cluster stack.
|
||||
|
||||
%package -n %{pkgname_pcmk_libs}-devel
|
||||
License: GPLv2+ and LGPLv2+
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
Summary: Pacemaker development package
|
||||
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-cluster-libs%{?_isa} = %{version}-%{release}
|
||||
|
|
@ -482,7 +492,7 @@ Requires: libqb-devel%{?_isa}
|
|||
Requires: %{?pkgname_libtool_devel_arch}
|
||||
%endif
|
||||
Requires: libuuid-devel%{?_isa}
|
||||
Requires: libxml2-devel%{?_isa}
|
||||
Requires: libxml2-devel%{?_isa} >= 2.6.0
|
||||
Requires: libxslt-devel%{?_isa}
|
||||
|
||||
%description -n %{pkgname_pcmk_libs}-devel
|
||||
|
|
@ -493,13 +503,15 @@ The %{pkgname_pcmk_libs}-devel package contains headers and shared libraries
|
|||
for developing tools for Pacemaker.
|
||||
|
||||
%package cts
|
||||
License: GPLv2+ and LGPLv2+
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
Summary: Test framework for cluster-related technologies like Pacemaker
|
||||
Requires: %{python_path}
|
||||
Requires: %{pkgname_pcmk_libs} = %{version}-%{release}
|
||||
Requires: %{name}-cli = %{version}-%{release}
|
||||
Requires: %{python_name}-%{name} = %{version}-%{release}
|
||||
Requires: %{pkgname_procps}
|
||||
Requires: psmisc
|
||||
Requires: %{python_name}-psutil
|
||||
BuildArch: noarch
|
||||
|
||||
# systemd Python bindings are a separate package in some distros
|
||||
|
|
@ -524,7 +536,7 @@ Pacemaker is an advanced, scalable High-Availability cluster resource
|
|||
manager.
|
||||
|
||||
%package schemas
|
||||
License: GPLv2+
|
||||
License: GPL-2.0-or-later
|
||||
Summary: Schemas and upgrade stylesheets for Pacemaker
|
||||
BuildArch: noarch
|
||||
|
||||
|
|
@ -550,7 +562,7 @@ Summary: Pacemaker Nagios Metadata
|
|||
Requires: pcmk-cluster-manager
|
||||
BuildArch: noarch
|
||||
|
||||
%description nagios-plugins-metadata
|
||||
%description nagios-plugins-metadata
|
||||
The metadata files required for Pacemaker to execute the nagios plugin
|
||||
monitor resources.
|
||||
|
||||
|
|
@ -573,6 +585,12 @@ export LDFLAGS_HARDENED_EXE="%{?_hardening_ldflags}"
|
|||
export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}"
|
||||
%endif
|
||||
|
||||
# DO NOT REMOVE THE FOLLOWING LINE!
|
||||
# This is necessary to ensure we use the git commit ID from the
|
||||
# pacemaker-abcd1234 directory name as the latest commit ID when
|
||||
# generating crm_config.h.
|
||||
rm -rf .git
|
||||
|
||||
./autogen.sh
|
||||
|
||||
%{configure} \
|
||||
|
|
@ -580,8 +598,8 @@ export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}"
|
|||
%{!?with_hardening: --disable-hardening} \
|
||||
%{?with_legacy_links: --enable-legacy-links} \
|
||||
%{?with_profiling: --with-profiling} \
|
||||
%{?with_coverage: --with-coverage} \
|
||||
%{?with_cibsecrets: --with-cibsecrets} \
|
||||
%{?with_nls: --enable-nls} \
|
||||
%{?with_sbd_sync: --with-sbd-sync-default="true"} \
|
||||
%{?gnutls_priorities: --with-gnutls-priorities="%{gnutls_priorities}"} \
|
||||
%{?bug_url: --with-bug-url=%{bug_url}} \
|
||||
|
|
@ -606,6 +624,10 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
|||
|
||||
make %{_smp_mflags} V=1
|
||||
|
||||
pushd python
|
||||
%py3_build
|
||||
popd
|
||||
|
||||
%check
|
||||
make %{_smp_mflags} check
|
||||
{ cts/cts-scheduler --run load-stopped-loop \
|
||||
|
|
@ -624,6 +646,10 @@ make install \
|
|||
DESTDIR=%{buildroot} V=1 docdir=%{pcmk_docdir} \
|
||||
%{?_python_bytecompile_extra:%{?py_byte_compile:am__py_compile=true}}
|
||||
|
||||
pushd python
|
||||
%py3_install
|
||||
popd
|
||||
|
||||
%if %{with upstart_job}
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/init
|
||||
install -m 644 pacemakerd/pacemaker.upstart ${RPM_BUILD_ROOT}%{_sysconfdir}/init/pacemaker.conf
|
||||
|
|
@ -640,13 +666,16 @@ done
|
|||
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/lib/rpm-state/%{name}
|
||||
%endif
|
||||
|
||||
%if %{with nls}
|
||||
%find_lang %{name}
|
||||
%endif
|
||||
|
||||
# Don't package libtool archives
|
||||
find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
|
||||
|
||||
# Do not package these either
|
||||
# Do not package these either on CentOS Stream
|
||||
rm -f %{buildroot}/%{_sbindir}/fence_legacy
|
||||
rm -f %{buildroot}/%{_mandir}/man8/fence_legacy.*
|
||||
find %{buildroot} -name '*o2cb*' -type f -print0 | xargs -0 rm -f
|
||||
|
||||
# For now, don't package the servicelog-related binaries built only for
|
||||
# ppc64le when certain dependencies are installed. If they get more exercise by
|
||||
|
|
@ -662,16 +691,6 @@ rm -f %{buildroot}/%{_sbindir}/ipmiservicelogd
|
|||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with coverage}
|
||||
GCOV_BASE=%{buildroot}/%{_var}/lib/pacemaker/gcov
|
||||
mkdir -p $GCOV_BASE
|
||||
find . -name '*.gcno' -type f | while read F ; do
|
||||
D=`dirname $F`
|
||||
mkdir -p ${GCOV_BASE}/$D
|
||||
cp $F ${GCOV_BASE}/$D
|
||||
done
|
||||
%endif
|
||||
|
||||
%post
|
||||
%if %{defined _unitdir}
|
||||
%systemd_post pacemaker.service
|
||||
|
|
@ -804,17 +823,20 @@ exit 0
|
|||
%exclude %{_datadir}/pacemaker/nagios
|
||||
%{_libexecdir}/pacemaker/*
|
||||
|
||||
%{_sbindir}/crm_attribute
|
||||
%{_sbindir}/crm_master
|
||||
%if %{with stonithd}
|
||||
%{_sbindir}/fence_legacy
|
||||
%endif
|
||||
%{_sbindir}/fence_watchdog
|
||||
|
||||
%doc %{_mandir}/man7/pacemaker-controld.*
|
||||
%doc %{_mandir}/man7/pacemaker-schedulerd.*
|
||||
%doc %{_mandir}/man7/pacemaker-fenced.*
|
||||
%doc %{_mandir}/man7/ocf_pacemaker_controld.*
|
||||
%doc %{_mandir}/man7/ocf_pacemaker_o2cb.*
|
||||
%doc %{_mandir}/man7/ocf_pacemaker_remote.*
|
||||
%doc %{_mandir}/man8/crm_attribute.*
|
||||
%doc %{_mandir}/man8/crm_master.*
|
||||
%if %{with stonithd}
|
||||
%doc %{_mandir}/man8/fence_legacy.*
|
||||
%endif
|
||||
%doc %{_mandir}/man8/fence_watchdog.*
|
||||
%doc %{_mandir}/man8/pacemakerd.*
|
||||
|
||||
|
|
@ -827,6 +849,7 @@ exit 0
|
|||
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cib
|
||||
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine
|
||||
%{ocf_root}/resource.d/pacemaker/controld
|
||||
%{ocf_root}/resource.d/pacemaker/o2cb
|
||||
%{ocf_root}/resource.d/pacemaker/remote
|
||||
|
||||
%if %{with upstart_job}
|
||||
|
|
@ -852,9 +875,11 @@ exit 0
|
|||
%if %{with cibsecrets}
|
||||
%{_sbindir}/cibsecret
|
||||
%endif
|
||||
%{_sbindir}/crm_attribute
|
||||
%{_sbindir}/crm_diff
|
||||
%{_sbindir}/crm_error
|
||||
%{_sbindir}/crm_failcount
|
||||
%{_sbindir}/crm_master
|
||||
%{_sbindir}/crm_mon
|
||||
%{_sbindir}/crm_node
|
||||
%{_sbindir}/crm_resource
|
||||
|
|
@ -875,24 +900,28 @@ exit 0
|
|||
%{_datadir}/snmp/mibs/PCMK-MIB.txt
|
||||
|
||||
%exclude %{ocf_root}/resource.d/pacemaker/controld
|
||||
%exclude %{ocf_root}/resource.d/pacemaker/o2cb
|
||||
%exclude %{ocf_root}/resource.d/pacemaker/remote
|
||||
|
||||
%dir %{ocf_root}
|
||||
%dir %{ocf_root}/resource.d
|
||||
%{ocf_root}/resource.d/pacemaker
|
||||
|
||||
%doc %{_mandir}/man7/*
|
||||
%doc %{_mandir}/man7/*pacemaker*
|
||||
%exclude %{_mandir}/man7/pacemaker-controld.*
|
||||
%exclude %{_mandir}/man7/pacemaker-schedulerd.*
|
||||
%exclude %{_mandir}/man7/pacemaker-fenced.*
|
||||
%exclude %{_mandir}/man7/ocf_pacemaker_controld.*
|
||||
%exclude %{_mandir}/man7/ocf_pacemaker_o2cb.*
|
||||
%exclude %{_mandir}/man7/ocf_pacemaker_remote.*
|
||||
%doc %{_mandir}/man8/*
|
||||
%exclude %{_mandir}/man8/crm_attribute.*
|
||||
%exclude %{_mandir}/man8/crm_master.*
|
||||
%exclude %{_mandir}/man8/fence_watchdog.*
|
||||
%exclude %{_mandir}/man8/pacemakerd.*
|
||||
%exclude %{_mandir}/man8/pacemaker-remoted.*
|
||||
%doc %{_mandir}/man8/crm*.8.gz
|
||||
%doc %{_mandir}/man8/attrd_updater.*
|
||||
%doc %{_mandir}/man8/cibadmin.*
|
||||
%if %{with cibsecrets}
|
||||
%doc %{_mandir}/man8/cibsecret.*
|
||||
%endif
|
||||
%doc %{_mandir}/man8/iso8601.*
|
||||
%doc %{_mandir}/man8/stonith_admin.*
|
||||
|
||||
%license licenses/GPLv2
|
||||
%doc COPYING
|
||||
|
|
@ -904,7 +933,7 @@ exit 0
|
|||
%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker
|
||||
%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker/bundles
|
||||
|
||||
%files -n %{pkgname_pcmk_libs}
|
||||
%files -n %{pkgname_pcmk_libs} %{?with_nls:-f %{name}.lang}
|
||||
%{_libdir}/libcib.so.*
|
||||
%{_libdir}/liblrmd.so.*
|
||||
%{_libdir}/libcrmservice.so.*
|
||||
|
|
@ -923,6 +952,14 @@ exit 0
|
|||
%doc COPYING
|
||||
%doc ChangeLog
|
||||
|
||||
%files -n %{python_name}-%{name}
|
||||
%{python3_sitelib}/pacemaker/
|
||||
%{python3_sitelib}/pacemaker-*.egg-info
|
||||
%exclude %{python3_sitelib}/pacemaker/_cts/
|
||||
%license licenses/LGPLv2.1
|
||||
%doc COPYING
|
||||
%doc ChangeLog
|
||||
|
||||
%files remote
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
|
||||
%if %{defined _unitdir}
|
||||
|
|
@ -947,7 +984,7 @@ exit 0
|
|||
%license licenses/CC-BY-SA-4.0
|
||||
|
||||
%files cts
|
||||
%{python_site}/cts
|
||||
%{python3_sitelib}/pacemaker/_cts/
|
||||
%{_datadir}/pacemaker/tests
|
||||
|
||||
%{_libexecdir}/pacemaker/cts-log-watcher
|
||||
|
|
@ -959,11 +996,16 @@ exit 0
|
|||
|
||||
%files -n %{pkgname_pcmk_libs}-devel
|
||||
%{_includedir}/pacemaker
|
||||
%{_libdir}/*.so
|
||||
%if %{with coverage}
|
||||
%{_var}/lib/pacemaker/gcov
|
||||
%endif
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_libdir}/libcib.so
|
||||
%{_libdir}/liblrmd.so
|
||||
%{_libdir}/libcrmservice.so
|
||||
%{_libdir}/libcrmcommon.so
|
||||
%{_libdir}/libpe_status.so
|
||||
%{_libdir}/libpe_rules.so
|
||||
%{_libdir}/libpacemaker.so
|
||||
%{_libdir}/libstonithd.so
|
||||
%{_libdir}/libcrmcluster.so
|
||||
%{_libdir}/pkgconfig/*pacemaker*.pc
|
||||
%license licenses/LGPLv2.1
|
||||
%doc COPYING
|
||||
%doc ChangeLog
|
||||
|
|
@ -974,14 +1016,202 @@ exit 0
|
|||
%{_datadir}/pacemaker/*.rng
|
||||
%{_datadir}/pacemaker/*.xsl
|
||||
%{_datadir}/pacemaker/api
|
||||
%{_datadir}/pacemaker/base
|
||||
%{_datadir}/pkgconfig/pacemaker-schemas.pc
|
||||
|
||||
%files nagios-plugins-metadata
|
||||
%dir %{_datadir}/pacemaker/nagios
|
||||
%dir %{_datadir}/pacemaker/nagios/plugins-metadata
|
||||
%attr(0644,root,root) %{_datadir}/pacemaker/nagios/plugins-metadata/*
|
||||
%license %{nagios_name}-%{nagios_hash}/COPYING
|
||||
|
||||
%changelog
|
||||
* Thu Mar 21 2024 Chris Lumens <clumens@redhat.com> - 2.1.7-5
|
||||
- Fix upgrading to this package on multilib systems
|
||||
- Resolves: RHEL-29007
|
||||
|
||||
* Thu Feb 1 2024 Chris Lumens <clumens@redhat.com> - 2.1.7-4
|
||||
- Properly validate attribute set type in pacemaker-attrd
|
||||
- Fix `crm_attribute -t nodes --node localhost`
|
||||
- Resolves: RHEL-14045
|
||||
- Resolves: RHEL-17224
|
||||
- Resolves: RHEL-23065
|
||||
|
||||
* Wed Jan 17 2024 Chris Lumens <clumens@redhat.com> - 2.1.7-3
|
||||
- Rebase on upstream 2.1.7 final release
|
||||
- Fix documentation for Pacemaker Remote schema transfers
|
||||
- Do not check CIB feature set version when CIB_file is set
|
||||
- Consolidate attrd cache handling
|
||||
- Avoid duplicating option metadata across daemons
|
||||
- Related: RHEL-7597
|
||||
- Related: RHEL-14045
|
||||
|
||||
* Thu Dec 14 2023 Chris Lumens <clumens@redhat.com> - 2.1.7-2
|
||||
- Rebase on upstream 2.1.7-rc4 release
|
||||
- Pacemaker Remote nodes can validate against later schema versions
|
||||
- Resolves: RHEL-7597
|
||||
- Related: RHEL-17224
|
||||
|
||||
* Mon Nov 27 2023 Chris Lumens <clumens@redhat.com> - 2.1.7-1
|
||||
- Rebase on upstream 2.1.7-rc2 release
|
||||
- Resolves: RHEL-7646
|
||||
- Related: RHEL-17224
|
||||
|
||||
* Tue Oct 31 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-9.1
|
||||
- Revert the rest of the attrd shutdown race condition fix
|
||||
- Related: RHEL-14052
|
||||
|
||||
* Mon Oct 23 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-9
|
||||
- Avoid an error if the elected attrd is on a node that is shutting down
|
||||
- Resolves: RHEL-14052
|
||||
|
||||
* Tue Aug 29 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-8
|
||||
- Fix an additional shutdown race between attrd and the controller
|
||||
- Related: rhbz2228955
|
||||
|
||||
* Mon Aug 7 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-7
|
||||
- Fix attrd race condition when shutting down
|
||||
- Resolves: rhbz2228955
|
||||
|
||||
* Thu Jul 27 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-6
|
||||
- Wait for a reply from various controller commands
|
||||
- Resolves: rhbz2225631
|
||||
- Related: rhbz2189300
|
||||
|
||||
* Tue Jul 25 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-5
|
||||
- Apply dampening when creating attributes with attrd_updater -U
|
||||
- Resolves: rhbz2224046
|
||||
- Related: rhbz2189300
|
||||
|
||||
* Wed Jul 19 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-4
|
||||
- Clone instances should not shuffle unnecessarily
|
||||
- Fix a bug in clone resource description display
|
||||
- Resolves: rhbz1931023
|
||||
- Resolves: rhbz1688149
|
||||
- Related: rhbz2106642
|
||||
- Related: rhbz2189300
|
||||
|
||||
* Mon Jul 10 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-3
|
||||
- Fix moving groups when there's a constraint for a single group member
|
||||
- Resolves: rhbz2218232
|
||||
- Resolves: rhbz2189300
|
||||
|
||||
* Wed Jun 21 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-2
|
||||
- Support start state for Pacemaker Remote nodes
|
||||
- Resolves: rhbz1502795
|
||||
|
||||
* Thu May 25 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-1
|
||||
- Rebase pacemaker on upstream 2.1.6 final release
|
||||
- Resolves: rhbz1578820
|
||||
- Resolves: rhbz1632951
|
||||
- Resolves: rhbz1876173
|
||||
- Resolves: rhbz2010084
|
||||
- Resolves: rhbz2030869
|
||||
- Resolves: rhbz2078611
|
||||
- Resolves: rhbz2106642
|
||||
- Resolves: rhbz2160206
|
||||
- Resolves: rhbz2168633
|
||||
|
||||
* Wed Feb 22 2023 Chris Lumens <clumens@redhat.com> - 2.1.5-8
|
||||
- Rebuild with new release due to build system problems
|
||||
- Related: rhbz2168249
|
||||
- Related: rhbz2168675
|
||||
|
||||
* Tue Feb 21 2023 Chris Lumens <clumens@redhat.com> - 2.1.5-7
|
||||
- Additional fixes for SIGABRT during pacemaker-fenced shutdown
|
||||
- Backport fix for attrd_updater -QA not displaying all nodes
|
||||
- Related: rhbz2168249
|
||||
- Resolves: rhbz2168675
|
||||
|
||||
* Wed Feb 8 2023 Chris Lumens <clumens@redhat.com> - 2.1.5-6
|
||||
- Backport fix for migration history cleanup causing resource recovery
|
||||
- Backport fix for SIGABRT during pacemaker-fenced shutdown
|
||||
- Resolves: rhbz2166388
|
||||
- Resolves: rhbz2168249
|
||||
|
||||
* Tue Jan 24 2023 Ken Gaillot <kgaillot@redhat.com> - 2.1.5-5
|
||||
- Backport fix for remote node shutdown regression
|
||||
- Resolves: rhbz2163567
|
||||
|
||||
* Fri Dec 9 2022 Chris Lumens <clumens@redhat.com> - 2.1.5-4
|
||||
- Rebase pacemaker on upstream 2.1.5 final release
|
||||
- Add support for sync points to attribute daemon
|
||||
- Resolves: rhbz1463033
|
||||
- Resolves: rhbz1866578
|
||||
- Resolves: rhbz2122352
|
||||
|
||||
* Tue Dec 6 2022 Chris Lumens <clumens@redhat.com> - 2.1.5-3
|
||||
- Fix errors found by covscan
|
||||
- Related: rhbz2122352
|
||||
|
||||
* Wed Nov 23 2022 Chris Lumens <clumens@redhat.com> - 2.1.5-2
|
||||
- Rebase on upstream 2.1.5-rc3 release
|
||||
- Resolves: rhbz1626546
|
||||
- Related: rhbz2122352
|
||||
|
||||
* Tue Nov 22 2022 Chris Lumens <clumens@redhat.com> - 2.1.5-1
|
||||
- Rebase on upstream 2.1.5-rc2 release
|
||||
- Resolves: rhbz1822125
|
||||
- Resolves: rhbz2095662
|
||||
- Resolves: rhbz2121852
|
||||
- Resolves: rhbz2122806
|
||||
- Resolves: rhbz2133497
|
||||
- Resolves: rhbz2142681
|
||||
|
||||
* Wed Aug 10 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.4-5
|
||||
- Fix regression in crm_resource -O
|
||||
- Resolves: rhbz2118337
|
||||
|
||||
* Wed Jul 20 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.4-4
|
||||
- Ensure all nodes are re-unfenced after device configuration change
|
||||
- crm_resource --why now checks node health status
|
||||
- Resolves: rhbz1872483
|
||||
- Resolves: rhbz2065818
|
||||
|
||||
* Wed Jun 29 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.4-3
|
||||
- Add support for ACL groups
|
||||
- Resolves: rhbz1724310
|
||||
|
||||
* Tue Jun 28 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.4-2
|
||||
- Restore crm_attribute query behavior when attribute does not exist
|
||||
- Resolves: rhbz2072107
|
||||
|
||||
* Wed Jun 15 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.4-1
|
||||
- Fencer should not ignore CIB updates when stonith is disabled
|
||||
- Rebase pacemaker on upstream 2.1.4 final release
|
||||
- Fix typo in ocf:pacemaker:HealthSMART meta-data
|
||||
- Resolves: rhbz2055935
|
||||
- Resolves: rhbz2072107
|
||||
- Resolves: rhbz2094855
|
||||
|
||||
* Wed Jun 1 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.3-2
|
||||
- crm_attribute works on remote node command line when hostname differs
|
||||
- Rebase pacemaker on upstream 2.1.3 final release
|
||||
- Resolves: rhbz1384172
|
||||
- Resolves: rhbz2072107
|
||||
|
||||
* Wed May 18 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.3-1
|
||||
- crm_resource --restart fails to restart clone instances except instance 0
|
||||
- Add new multiple-active option for "stop unexpected instances"
|
||||
- Unable to show metadata for "service" agents with "@" and "." in the name
|
||||
- Resource ocf:pacemaker:attribute does not comply with the OCF 1.1 standard
|
||||
- Allow resource meta-attribute to exempt resource from node health restrictions
|
||||
- Show node health states in crm_mon
|
||||
- Rebase pacemaker on upstream 2.1.3-rc2 release
|
||||
- crm_mon API result does not validate against schema if fence event has exit-reason
|
||||
- Resolves: rhbz1930578
|
||||
- Resolves: rhbz2036815
|
||||
- Resolves: rhbz2045096
|
||||
- Resolves: rhbz2049722
|
||||
- Resolves: rhbz2059638
|
||||
- Resolves: rhbz2065812
|
||||
- Resolves: rhbz2072107
|
||||
- Resolves: rhbz2086230
|
||||
|
||||
* Wed Jan 26 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.2-4
|
||||
- Fix regression in down event detection that affects remote nodes
|
||||
- Resolves: rhbz2046446
|
||||
|
||||
* Fri Jan 21 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.2-3
|
||||
- Improve display of failed actions
|
||||
- Handle certain probe failures as stopped instead of failed
|
||||
|
|
@ -1040,7 +1270,7 @@ exit 0
|
|||
- Show better error messages in crm_resource with invalid resource types
|
||||
- Avoid selecting wrong device when dynamic-list fencing is used with host map
|
||||
- Do not schedule probes of unmanaged resources on pending nodes
|
||||
- Fix regressions in crm_attribute and crm_master argument handling
|
||||
- Fix argument handling regressions in crm_attribute and wrappers
|
||||
- Resolves: rhbz1447918
|
||||
- Resolves: rhbz1978010
|
||||
- Resolves: rhbz1982453
|
||||
|
|
@ -1309,7 +1539,7 @@ exit 0
|
|||
- Resolves: rhbz#1622969
|
||||
|
||||
* Mon Aug 13 2018 Ken Gaillot <kgaillot@redhat.com> - 2.0.0-7
|
||||
- Include upstream master branch commits through 975347d4
|
||||
- Include upstream main branch commits through 975347d4
|
||||
- Resolves: rhbz#1543494
|
||||
- Resolves: rhbz#1602650
|
||||
- Resolves: rhbz#1608369
|
||||
|
|
@ -1480,7 +1710,7 @@ exit 0
|
|||
|
||||
* Thu Aug 20 2015 Andrew Beekhof <abeekhof@redhat.com> - 1.1.13-2
|
||||
- Update for new upstream tarball: Pacemaker-1.1.13
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.12-2.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
|
@ -1490,7 +1720,7 @@ exit 0
|
|||
|
||||
* Tue Oct 28 2014 Andrew Beekhof <abeekhof@redhat.com> - 1.1.12-1
|
||||
- Update for new upstream tarball: Pacemaker-1.1.12+ (a9c8177)
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.11-1.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
|
@ -1500,11 +1730,11 @@ exit 0
|
|||
|
||||
* Tue Feb 18 2014 Andrew Beekhof <abeekhof@redhat.com> - 1.1.11-1
|
||||
- Update for new upstream tarball: Pacemaker-1.1.11 (9d39a6b)
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
|
||||
|
||||
* Thu Jun 20 2013 Andrew Beekhof <abeekhof@redhat.com> - 1.1.9-3
|
||||
- Update to upstream 7d8acec
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
|
||||
|
||||
+ Feature: Turn off auto-respawning of systemd services when the cluster starts them
|
||||
+ Fix: crmd: Ensure operations for cleaned up resources don't block recovery
|
||||
|
|
@ -1512,11 +1742,11 @@ exit 0
|
|||
|
||||
* Mon Jun 17 2013 Andrew Beekhof <abeekhof@redhat.com> - 1.1.9-2
|
||||
- Update for new upstream tarball: 781a388
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
|
||||
|
||||
* Wed May 12 2010 Andrew Beekhof <andrew@beekhof.net> - 1.1.2-1
|
||||
- Update the tarball from the upstream 1.1.2 release
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
|
||||
- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
|
||||
|
||||
* Tue Jul 14 2009 Andrew Beekhof <andrew@beekhof.net> - 1.0.4-1
|
||||
- Initial checkin
|
||||
|
|
|
|||
Loading…
Reference in New Issue