Revert the rest of the attrd shutdown race condition fix

- Related: RHEL-14052
This commit is contained in:
Chris Lumens 2023-10-31 12:01:42 -04:00
parent 5f4fb09dda
commit 3a48395f23
2 changed files with 40 additions and 1 deletions

34
011-revert-f5263c94.patch Normal file
View File

@ -0,0 +1,34 @@
From 14b87a38786ae5b4dc12fc1581e5d39a274fced2 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Mon, 30 Oct 2023 12:21:24 -0500
Subject: [PATCH] Fix: attrd: revert faulty T138 fix
f5263c9401 created a timing issue where a node could get a shutdown attribute,
the original writer leaves the cluster before writing it out, then the
shutting-down node wins the writer election. In that case, it would skip the
write-out and the scheduler would never shut it down.
Reopens T138
---
daemons/attrd/attrd_elections.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/daemons/attrd/attrd_elections.c b/daemons/attrd/attrd_elections.c
index 62310ed1d8..82fbe8affc 100644
--- a/daemons/attrd/attrd_elections.c
+++ b/daemons/attrd/attrd_elections.c
@@ -22,14 +22,6 @@
{
attrd_declare_winner();
- if (attrd_requesting_shutdown() || attrd_shutting_down()) {
- /* This node is shutting down or about to, meaning its attributes will
- * be removed (and may have already been removed from the CIB by a
- * controller). Don't sync or write its attributes in this case.
- */
- return G_SOURCE_REMOVE;
- }
-
/* Update the peers after an election */
attrd_peer_sync(NULL, NULL);

View File

@ -242,7 +242,7 @@
Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
Version: %{pcmkversion}
Release: %{pcmk_release}%{?dist}
Release: %{pcmk_release}.1%{?dist}
%if %{defined _unitdir}
License: GPL-2.0-or-later AND LGPL-2.1-or-later
%else
@ -273,6 +273,7 @@ Patch007: 007-glib-assertions.patch
Patch008: 008-attrd-shutdown.patch
Patch009: 009-attrd-shutdown-2.patch
Patch010: 010-revert-58400e27.patch
Patch011: 011-revert-f5263c94.patch
# downstream-only commits
#Patch1xx: 1xx-xxxx.patch
@ -1011,6 +1012,10 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING
%changelog
* 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