import pacemaker-2.1.2-4.el8

SOURCES/023-regression.patch

@@ -0,0 +1,30 @@
+From 16928cfc69136bc56b1574bee9966e0d5de73abd Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Wed, 26 Jan 2022 09:15:43 -0600
+Subject: [PATCH] Fix: controller: correctly match "node down" events
+
+regression introduced in 2.1.2 by 03ce7376e
+
+The symptom that led to this was that removing a remote node connection
+resource would lead to the remote node getting fenced when the connection stop
+was not recognized as an expected down event.
+---
+ daemons/controld/controld_te_events.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/daemons/controld/controld_te_events.c b/daemons/controld/controld_te_events.c
+index 36fd832ba0..1fd7129922 100644
+--- a/daemons/controld/controld_te_events.c
++++ b/daemons/controld/controld_te_events.c
+@@ -304,7 +304,7 @@ match_down_event(const char *target)
+              gIter2 = gIter2->next) {
+ 
+             match = (crm_action_t*)gIter2->data;
+-            if (pcmk_is_set(match->flags, pcmk__graph_action_confirmed)) {
++            if (pcmk_is_set(match->flags, pcmk__graph_action_executed)) {
+                 xpath_ret = xpath_search(match->xml, xpath);
+                 if (numXpathResults(xpath_ret) < 1) {
+                     match = NULL;
+-- 
+2.27.0
+

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.2
-%global specversion 3
+%global specversion 4
 
 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
 %global commit ada5c3b36e2adf1703d54d39f40a4b8628eca175
@@ -285,6 +285,7 @@ Patch19:       019-corosync-tracking.patch
 Patch20:       020-systemd-unit.patch
 Patch21:       021-failure-messages.patch
 Patch22:       022-memory-leak.patch
+Patch23:       023-regression.patch
 
 # downstream-only commits
 #Patch1xx:      1xx-xxxx.patch
@@ -982,6 +983,10 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* 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