diff --git a/005-attrd-dampen.patch b/005-attrd-dampen.patch new file mode 100644 index 0000000..80c8a67 --- /dev/null +++ b/005-attrd-dampen.patch @@ -0,0 +1,26 @@ +From ebac530c815a62f7c3a1c24f64e9a530d9753dbe Mon Sep 17 00:00:00 2001 +From: Hideo Yamauchi +Date: Wed, 19 Jul 2023 18:21:07 +0900 +Subject: [PATCH] High: tools: The dampen parameter is disabled when setting + values with attrd_updater. + +--- + tools/attrd_updater.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/attrd_updater.c b/tools/attrd_updater.c +index b615a3575..4688b9ff6 100644 +--- a/tools/attrd_updater.c ++++ b/tools/attrd_updater.c +@@ -501,7 +501,7 @@ send_attrd_update(char command, const char *attr_node, const char *attr_name, + + case 'U': + rc = pcmk__attrd_api_update(NULL, attr_node, attr_name, attr_value, +- NULL, attr_set, NULL, ++ attr_dampen, attr_set, NULL, + attr_options | pcmk__node_attr_value); + break; + +-- +2.41.0 + diff --git a/pacemaker.spec b/pacemaker.spec index 7130490..b5e920a 100644 --- a/pacemaker.spec +++ b/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.6 -%global specversion 5 +%global specversion 6 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build %global commit 6fdc9deea294bbad629b003c6ae036aaed8e3ee0 @@ -252,6 +252,7 @@ Patch001: 001-remote-start-state.patch Patch002: 002-group-colocation-constraint.patch Patch003: 003-clone-shuffle.patch Patch004: 004-clone-rsc-display.patch +Patch005: 005-attrd-dampen.patch Requires: resource-agents Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release} @@ -901,6 +902,11 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Mon Jul 24 2023 Chris Lumens - 2.1.6-6 +- Apply dampening when creating attributes with attrd_updater -U +- Resolves: rhbz2224051 +- Related: rhbz2189301 + * Wed Jul 19 2023 Chris Lumens - 2.1.6-5 - Clone instances should not shuffle unnecessarily - Fix a bug in clone resource description display