import pacemaker-2.0.5-9.el8_4.1

This commit is contained in:
CentOS Sources 2021-05-18 13:11:38 -04:00 committed by Cloud User
parent 65c2d339aa
commit 185e259ad8
3 changed files with 66 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 49ebe4ce934b7bcc81b77a61e7ba3cf76f4ce911 Mon Sep 17 00:00:00 2001
From: Klaus Wenninger <klaus.wenninger@aon.at>
Date: Mon, 12 Apr 2021 15:06:09 +0200
Subject: [PATCH] Fix: crm_mon: try to connect CIB while pacemakerd shutting
down
actually while resources are evacuated from the node. But atm
there is no clean and easy way to tell when this is done and
pacemakerd is just shutting down leftover daemons. So try to
connect anyway.
---
tools/crm_mon.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/crm_mon.c b/tools/crm_mon.c
index f77268a..8b6e174 100644
--- a/tools/crm_mon.c
+++ b/tools/crm_mon.c
@@ -1014,6 +1014,8 @@ pacemakerd_status(void)
break;
case pcmk_pacemakerd_state_shutting_down:
print_as(output_format ,"Pacemaker daemons shutting down ...\n");
+ /* try our luck maybe CIB is still accessible */
+ rc = pcmk_rc_ok;
break;
case pcmk_pacemakerd_state_shutdown_complete:
/* assuming pacemakerd doesn't dispatch any pings after entering
--
1.8.3.1

View File

@ -0,0 +1,29 @@
From 46d6edd5a7eb6079925ed69576c754ab46ab3f1d Mon Sep 17 00:00:00 2001
From: Klaus Wenninger <klaus.wenninger@aon.at>
Date: Tue, 13 Apr 2021 09:59:00 +0200
Subject: [PATCH] Fix: crm_mon: try to connect CIB while pacemakerd shutting
down
we need to do this in all output modes (xml specifically)
---
tools/crm_mon.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/crm_mon.c b/tools/crm_mon.c
index 8b6e174..95adef8 100644
--- a/tools/crm_mon.c
+++ b/tools/crm_mon.c
@@ -1031,6 +1031,10 @@ pacemakerd_status(void)
case pcmk_pacemakerd_state_running:
rc = pcmk_rc_ok;
break;
+ case pcmk_pacemakerd_state_shutting_down:
+ /* try our luck maybe CIB is still accessible */
+ rc = pcmk_rc_ok;
+ break;
default:
break;
}
--
1.8.3.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
%if %{defined _unitdir}
License: GPLv2+ and LGPLv2+
%else
@ -287,6 +287,8 @@ Patch36: 036-crm_resource.patch
Patch37: 037-scheduler.patch
Patch38: 038-feature-set.patch
Patch39: 039-crm_mon.patch
Patch40: 040-crm_mon-shutdown.patch
Patch41: 041-crm_mon-shutdown.patch
# downstream-only commits
Patch100: 100-default-to-syncing-with-sbd.patch
@ -984,6 +986,10 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING
%changelog
* Mon Apr 19 2021 Ken Gaillot <kgaillot@redhat.com> - 2.0.5-9.1
- Fix regression in crm_mon during cluster shutdown that affects ocf:heartbeat:pgsql agent
- Resolves: rhbz1951098
* Tue Mar 2 2021 Ken Gaillot <kgaillot@redhat.com> - 2.0.5-9
- Avoid pcs failures when Pacemaker records negative call ID in history
- Resolves: rhbz1931332