From 1057dfad952345c5ee09ec583bb81b1d6738918b Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Tue, 25 Jul 2023 07:34:38 -0400
Subject: [PATCH] Apply dampening when creating attributes with attrd_updater
 -U

- Resolves: rhbz2224046
- Related: rhbz2189300
---
 005-attrd-dampen.patch | 26 ++++++++++++++++++++++++++
 pacemaker.spec         |  8 +++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 005-attrd-dampen.patch

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 <renayama19661014@ybb.ne.jp>
+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 5e96251..f49f82e 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 4
+%global specversion 5
 
 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
 %global commit 6fdc9deea294bbad629b003c6ae036aaed8e3ee0
@@ -267,6 +267,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
 
 # downstream-only commits
 #Patch1xx:      1xx-xxxx.patch
@@ -1005,6 +1006,11 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Tue Jul 25 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-5
+- Apply dampening when creating attributes with attrd_updater -U
+- Resolves: rhbz2224046
+- Related: rhbz2189300
+
 * Wed Jul 19 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-4
 - Clone instances should not shuffle unnecessarily
 - Fix a bug in clone resource description display