Rebase on upstream 3.0.1-rc1

- Use dbus to detect completion of systemd resource start/stop actions
- Add an option for controlling remote node fencing behavior
- Split large IPC messages into multiple smaller ones
- Related: RHEL-86085
- Resolves: RHEL-71181
- Resolves: RHEL-86146
- Resolves: RHEL-86144
This commit is contained in:
Chris Lumens 2025-06-23 16:40:41 -04:00
parent d12595d4b4
commit 834fdc824d
3 changed files with 16 additions and 33 deletions

View File

@ -1,26 +0,0 @@
From 78e6b46a2bbb80af24a804045313370a6404a251 Mon Sep 17 00:00:00 2001
From: Hideo Yamauchi <renayama19661014@ybb.ne.jp>
Date: Thu, 9 Jan 2025 08:32:48 +0900
Subject: [PATCH] Mid: schedulerd: Resetting error and warning flags.
---
lib/pengine/status.c | 3 +++
1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/lib/pengine/status.c b/lib/pengine/status.c
index a97d6f7..87b5f6c 100644
--- a/lib/pengine/status.c
+++ b/lib/pengine/status.c
@@ -447,6 +447,9 @@ set_working_set_defaults(pcmk_scheduler_t *scheduler)
|pcmk__sched_stop_removed_resources
|pcmk__sched_cancel_removed_actions);
#endif
+
+ pcmk__config_has_error = false;
+ pcmk__config_has_warning = false;
}
pcmk_resource_t *
--
2.47.0

View File

@ -40,11 +40,11 @@
## Upstream pacemaker version, and its package version (specversion
## can be incremented to build packages reliably considered "newer"
## than previously built packages with the same pcmkversion)
%global pcmkversion 3.0.0
%global specversion 6
%global pcmkversion 3.0.1
%global specversion 1
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
%global commit d8340737c46ccb265bd82c5493b58e9c14ba67e5
%global commit 9a5e54bae85847c4bb6ed7c7fb06103ebebbc64a
## Since git v2.11, the extent of abbreviation is autoscaled by default
## (used to be constant of 7), so we need to convey it for non-tags, too.
@ -199,7 +199,7 @@ Url: https://www.clusterlabs.org/
Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{archive_github_url}
Source1: pacemaker.sysusers
# upstream commits
Patch001: 001-reset-error-warning-flags.patch
#Patch001: 001-xxxx.patch
Requires: resource-agents
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
@ -273,7 +273,6 @@ BuildRequires: %{pkgname_glue_libs}-devel
%endif
%if %{with doc}
BuildRequires: asciidoc
BuildRequires: %{python_name}-sphinx
%endif
@ -499,7 +498,7 @@ popd
%check
make %{_smp_mflags} check
{ cts/cts-scheduler --run load-stopped-loop \
&& cts/cts-cli \
&& cts/cts-cli -V \
&& touch .CHECKED
} 2>&1 | sed 's/[fF]ail/faiil/g' # prevent false positives in rpmlint
[ -f .CHECKED ] && rm -f -- .CHECKED
@ -792,6 +791,16 @@ exit 0
%{_datadir}/pkgconfig/pacemaker-schemas.pc
%changelog
* Tue Jun 24 2025 Chris Lumens <clumens@redhat.com> - 3.0.1-1
- Rebase on upstream 3.0.1-rc1
- Use dbus to detect completion of systemd resource start/stop actions
- Add an option for controlling remote node fencing behavior
- Split large IPC messages into multiple smaller ones
- Related: RHEL-86085
- Resolves: RHEL-71181
- Resolves: RHEL-86146
- Resolves: RHEL-86144
* Wed Apr 02 2025 Kashyap Chamarthy <kchamart@redhat.com> - 3.0.0-6
- Add riscv64 into ExclusiveArch (thanks, Zhengyu He)

View File

@ -1 +1 @@
SHA512 (pacemaker-d8340737c.tar.gz) = d91c7aa0cd5c607061e43b9b9403cfa806b86eb2730187e701a40c2b245ce8fbf34361af7a5ac9a4985b34f0dbdc6436815dcba5b6b177a7d058692599bd46ec
SHA512 (pacemaker-9a5e54bae.tar.gz) = 7c90f7cb985933ba3e0254118bab5c2af050e61c22ab683255c06282df196dcca439ecdc016e22fa7751a4744092abd6801451babfb8f4d03d4d67c1fee56ed9