From 65904a588c010b28975b8e66a696662c309fdcb8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 19 Aug 2022 18:17:37 +0000 Subject: [PATCH] import pacemaker-2.1.4-5.el8 --- SOURCES/012-crm_resource.patch | 38 ++++++++++++++++++++++++++++++++++ SPECS/pacemaker.spec | 23 ++++++++++++-------- 2 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 SOURCES/012-crm_resource.patch diff --git a/SOURCES/012-crm_resource.patch b/SOURCES/012-crm_resource.patch new file mode 100644 index 0000000..a087b3f --- /dev/null +++ b/SOURCES/012-crm_resource.patch @@ -0,0 +1,38 @@ +From fe9150bc4b740b3748fec34fe668df4f8c0d0e25 Mon Sep 17 00:00:00 2001 +From: Ken Gaillot +Date: Tue, 9 Aug 2022 15:38:03 -0500 +Subject: [PATCH] Fix: tools: correct minimum execution status shown by + crm_resource -O + +regression introduced in 2.1.0 by 5ef28b946 + +Fixes T533 +--- + lib/pengine/pe_output.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/pengine/pe_output.c b/lib/pengine/pe_output.c +index 5d716fe6cb..dbb49637c9 100644 +--- a/lib/pengine/pe_output.c ++++ b/lib/pengine/pe_output.c +@@ -1878,7 +1878,7 @@ node_and_op(pcmk__output_t *out, va_list args) { + time_t last_change = 0; + + pcmk__scan_min_int(crm_element_value(xml_op, XML_LRM_ATTR_OPSTATUS), +- &status, 0); ++ &status, PCMK_EXEC_UNKNOWN); + + rsc = pe_find_resource(data_set->resources, op_rsc); + +@@ -1932,7 +1932,7 @@ node_and_op_xml(pcmk__output_t *out, va_list args) { + xmlNode *node = NULL; + + pcmk__scan_min_int(crm_element_value(xml_op, XML_LRM_ATTR_OPSTATUS), +- &status, 0); ++ &status, PCMK_EXEC_UNKNOWN); + node = pcmk__output_create_xml_node(out, "operation", + "op", op_key ? op_key : ID(xml_op), + "node", crm_element_value(xml_op, XML_ATTR_UNAME), +-- +2.31.1 + diff --git a/SPECS/pacemaker.spec b/SPECS/pacemaker.spec index 4cb0718..8e3359e 100644 --- a/SPECS/pacemaker.spec +++ b/SPECS/pacemaker.spec @@ -36,7 +36,7 @@ ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) %global pcmkversion 2.1.4 -%global specversion 4 +%global specversion 5 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build %global commit dc6eb4362e67c1497a413434eba097063bf1ef83 @@ -275,6 +275,7 @@ Patch008: 008-metadata.patch Patch009: 009-validate.patch Patch010: 010-regression.patch Patch011: 011-unfencing.patch +Patch012: 012-crm_resource.patch # downstream-only commits #Patch1xx: 1xx-xxxx.patch @@ -963,6 +964,10 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Wed Aug 10 2022 Ken Gaillot - 2.1.4-5 +- Fix regression in crm_resource -O +- Resolves: rhbz2118337 + * Wed Jul 20 2022 Ken Gaillot - 2.1.4-4 - Ensure all nodes are re-unfenced after device configuration change - crm_resource --why now checks node health status @@ -1071,7 +1076,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 @@ -1340,7 +1345,7 @@ exit 0 - Resolves: rhbz#1622969 * Mon Aug 13 2018 Ken Gaillot - 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 @@ -1511,7 +1516,7 @@ exit 0 * Thu Aug 20 2015 Andrew Beekhof - 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 - 1.1.12-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -1521,7 +1526,7 @@ exit 0 * Tue Oct 28 2014 Andrew Beekhof - 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 - 1.1.11-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild @@ -1531,11 +1536,11 @@ exit 0 * Tue Feb 18 2014 Andrew Beekhof - 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 - 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 @@ -1543,11 +1548,11 @@ exit 0 * Mon Jun 17 2013 Andrew Beekhof - 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 - 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 - 1.0.4-1 - Initial checkin