import pacemaker-2.1.2-4.el9_0.1

This commit is contained in:
CentOS Sources 2022-09-20 07:42:39 -04:00 committed by Stepan Oksanichenko
parent 7b51f9e49e
commit a03911d153
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,38 @@
From fe9150bc4b740b3748fec34fe668df4f8c0d0e25 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
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

View File

@ -226,7 +226,7 @@
Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
Version: %{pcmkversion}
Release: %{pcmk_release}%{?dist}
Release: %{pcmk_release}%{?dist}.1
License: GPLv2+ and LGPLv2+
Url: https://www.clusterlabs.org/
@ -267,6 +267,7 @@ Patch22: 022-failure-messages.patch
Patch23: 023-memory-leak.patch
Patch24: 024-daemon-tracking.patch
Patch25: 025-regression.patch
Patch26: 026-crm_resource.patch
Requires: resource-agents
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
@ -873,6 +874,10 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING
%changelog
* Tue Aug 16 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.2-4.1
- Fix regression in crm_resource -O
- Resolves: rhbz2118744
* Wed Jan 26 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.2-4
- Fix regression in down event detection that affects remote nodes
- Resolves: rhbz2039399