Auto sync2gitlab import of resource-agents-4.9.0-29.el8.src.rpm

bz2116941-ethmonitor-ovsmonitor-pgsql-fix-attrd_updater-q.patch

@@ -0,0 +1,75 @@
+From 0063164d72bbaca68f12a2f0a7dbae9ccb41fa39 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 26 Jul 2022 09:08:26 +0200
+Subject: [PATCH] ethmonitor/ovsmonitor/pgsql: remove ignored attrd_updater
+ "-q" parameter
+
+attrd_updater in 2.1.3 no longer ignores the -q parameter, which makes
+these agents break. It never did anything in attrd_updater, and is
+probably left-over from copy/paste crm_attribute code that got changed
+to attrd_updater.
+---
+ heartbeat/ethmonitor | 2 +-
+ heartbeat/ovsmonitor | 2 +-
+ heartbeat/pgsql      | 8 ++++----
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/heartbeat/ethmonitor b/heartbeat/ethmonitor
+index ba8574131..451738a0b 100755
+--- a/heartbeat/ethmonitor
++++ b/heartbeat/ethmonitor
+@@ -464,7 +464,7 @@ END
+ 
+ set_cib_value() {
+ 	local score=`expr $1 \* $OCF_RESKEY_multiplier`
+-	attrd_updater -n $ATTRNAME -v $score -q
++	attrd_updater -n $ATTRNAME -v $score
+ 	local rc=$?
+ 	case $rc in
+ 		0) ocf_log debug "attrd_updater: Updated $ATTRNAME = $score" ;;
+diff --git a/heartbeat/ovsmonitor b/heartbeat/ovsmonitor
+index 872ce86eb..6765da4b9 100755
+--- a/heartbeat/ovsmonitor
++++ b/heartbeat/ovsmonitor
+@@ -355,7 +355,7 @@ END
+ 
+ set_cib_value() {
+ 	local score=`expr $1 \* $OCF_RESKEY_multiplier`
+-	attrd_updater -n $ATTRNAME -v $score -q
++	attrd_updater -n $ATTRNAME -v $score
+ 	local rc=$?
+ 	case $rc in
+ 		0) ocf_log debug "attrd_updater: Updated $ATTRNAME = $score" ;;
+diff --git a/heartbeat/pgsql b/heartbeat/pgsql
+index 94aceb324..e93d66855 100755
+--- a/heartbeat/pgsql
++++ b/heartbeat/pgsql
+@@ -808,7 +808,7 @@ pgsql_real_stop() {
+     local stop_escalate
+ 
+     if ocf_is_true ${OCF_RESKEY_check_wal_receiver}; then
+-        attrd_updater -n "$PGSQL_WAL_RECEIVER_STATUS_ATTR" -D -q
++        attrd_updater -n "$PGSQL_WAL_RECEIVER_STATUS_ATTR" -D
+     fi
+ 
+     if ! pgsql_status
+@@ -937,16 +937,16 @@ pgsql_wal_receiver_status() {
+     receiver_parent_pids=`ps -ef | tr -s " " | grep "[w]al\s*receiver" | cut -d " " -f 3`
+ 
+     if echo "$receiver_parent_pids" | grep -q -w "$PID" ; then
+-        attrd_updater -n "$PGSQL_WAL_RECEIVER_STATUS_ATTR" -v "normal" -q
++        attrd_updater -n "$PGSQL_WAL_RECEIVER_STATUS_ATTR" -v "normal"
+         return 0
+     fi
+ 
+     if [ $pgsql_real_monitor_status -eq "$OCF_RUNNING_MASTER" ]; then
+-        attrd_updater -n "$PGSQL_WAL_RECEIVER_STATUS_ATTR" -v "normal (master)" -q
++        attrd_updater -n "$PGSQL_WAL_RECEIVER_STATUS_ATTR" -v "normal (master)"
+         return 0
+     fi
+ 
+-    attrd_updater -n "$PGSQL_WAL_RECEIVER_STATUS_ATTR" -v "ERROR" -q
++    attrd_updater -n "$PGSQL_WAL_RECEIVER_STATUS_ATTR" -v "ERROR"
+     ocf_log warn "wal receiver process is not running"
+     return 1
+ }

resource-agents.spec

@@ -69,7 +69,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.9.0
-Release:	28%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	29%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -119,6 +119,7 @@ Patch27:	bz2103370-ocf-tester-1-update.patch
 Patch28:	bz2103370-ocf-tester-2-remove-deprecated-lrmd-lrmadmin-code.patch
 Patch29:	bz1908146-bz1908147-bz1908148-bz1949114-openstack-agents-set-domain-parameters-default.patch
 Patch30:	bz2090370-CTDB-move-process-to-root-cgroup-if-rt-enabled.patch
+Patch31:	bz2116941-ethmonitor-ovsmonitor-pgsql-fix-attrd_updater-q.patch
 
 # bundle patches
 Patch1000:	7-gcp-bundled.patch
@@ -329,6 +330,7 @@ exit 1
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -904,6 +906,12 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Wed Aug 10 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-29
+- ethmonitor/pgsql: remove attrd_updater "-q" parameter to solve issue
+  with Pacemaker 2.1.3+ not ignoring it
+
+  Resolves: rhbz#2116941
+
 * Thu Aug  4 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-28
 - CTDB: move process to root cgroup if realtime scheduling is enabled