diff --git a/Fix-docker-RA-behavior-when-Docker-isn-t-running.patch b/Fix-docker-RA-behavior-when-Docker-isn-t-running.patch new file mode 100644 index 0000000000000000000000000000000000000000..7023ac4eee6312e0e784e4cf6d5c4910b026cbde --- /dev/null +++ b/Fix-docker-RA-behavior-when-Docker-isn-t-running.patch @@ -0,0 +1,27 @@ +From ed418237891d4a5003ba3513e417d34fa86bbb52 Mon Sep 17 00:00:00 2001 +From: Ryan Ronnander +Date: Fri, 23 Feb 2024 10:00:28 -0800 +Subject: [PATCH] Fix docker RA behavior when Docker isn't running + +--- + heartbeat/docker | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/heartbeat/docker b/heartbeat/docker +index 2adcadee..50523db9 100755 +--- a/heartbeat/docker ++++ b/heartbeat/docker +@@ -293,8 +293,8 @@ docker_simple_status() + VERSION_OUT=$(docker version) + version_ret=$? + if [ $version_ret -eq 1 ]; then +- ocf_exit_reason "Docker service is in error state while checking for ${CONTAINER}, based on image, ${OCF_RESKEY_image}: ${VERSION_OUT}" +- return $OCF_ERR_GENERIC ++ ocf_log err "Docker service is not running or in error state while checking for ${CONTAINER}, based on image, ${OCF_RESKEY_image}: ${VERSION_OUT}" ++ return $OCF_NOT_RUNNING + fi + + container_exists +-- +2.41.0 + diff --git a/Low-IPaddr2-Remove-stray-backslash.patch b/Low-IPaddr2-Remove-stray-backslash.patch new file mode 100644 index 0000000000000000000000000000000000000000..44a2abf0448cae0bb76872344354d802ed2b8f0c --- /dev/null +++ b/Low-IPaddr2-Remove-stray-backslash.patch @@ -0,0 +1,33 @@ +From a0b09687b6b26331fe6ec20915a122dcb7034aaa Mon Sep 17 00:00:00 2001 +From: Reid Wahl +Date: Sun, 10 Dec 2023 12:11:41 -0800 +Subject: [PATCH] Low: IPaddr2: Remove stray backslash + +Fixes this warning (which gets logged on every recurring monitor for a +Pacemaker resource): + +$ OCF_ROOT=/usr/lib/ocf OCF_RESKEY_ip=192.168.22.41 \ + /usr/lib/ocf/resource.d/heartbeat/IPaddr2 monitor +grep: warning: stray \ before white space + +Signed-off-by: Reid Wahl +--- + heartbeat/IPaddr2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2 +index 97a7431a..5f30b8f9 100755 +--- a/heartbeat/IPaddr2 ++++ b/heartbeat/IPaddr2 +@@ -624,7 +624,7 @@ find_interface() { + # List interfaces but exclude FreeS/WAN ipsecN virtual interfaces + # + local iface="`$IP2UTIL -o -f $FAMILY addr show \ +- | grep "\ $ipaddr/$netmask" \ ++ | grep " $ipaddr/$netmask" \ + | cut -d ' ' -f2 \ + | grep -v '^ipsec[0-9][0-9]*$'`" + +-- +2.41.0 + diff --git a/resource-agents.spec b/resource-agents.spec index a1dbce2180cef1df2793438382d37ecc1d776595..7071184135e50abdde14dfe8f16e7d6fbe36f041 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -1,7 +1,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.13.0 -Release: 7 +Release: 9 License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents Source0: https://github.com/ClusterLabs/resource-agents/archive/v%{version}.tar.gz @@ -12,6 +12,9 @@ Patch0003: fix-handler-out-of-scope-leak.patch Patch0004: fix-uninitialized-value-covscan-error.patch Patch0005: Avoid-false-positive-for-VG-activation.patch Patch0006: Don-t-build-with-ansi-by-default.patch +Patch0007: Fix-docker-RA-behavior-when-Docker-isn-t-running.patch +Patch0008: Low-IPaddr2-Remove-stray-backslash.patch + Obsoletes: heartbeat-resources <= %{version} Provides: heartbeat-resources = %{version} BuildRequires: automake autoconf pkgconfig gcc perl-interpreter perl-generators python3-devel @@ -109,6 +112,12 @@ export CFLAGS="$(echo '%{optflags}')" %{_mandir}/man8/{ocf-tester.8*,ldirectord.8*} %changelog +* Fri Mar 01 2024 bizhiyuan - 4.13.0-9 +- Low: IPaddr2: Remove stray backslash + +* Fri Mar 01 2024 bizhiyuan - 4.13.0-8 +- Fix docker RA behavior when Docker is not running + * Fri Feb 23 2024 bixiaoyan - 4.13.0-7 - Don't build with -ansi by default