Commit 51e4d89d authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import resource-agents-4.1.1-90.el8_4.6

parent eb5a67a4
From 6877b20a83cb691884996bf77385259388fdebb2 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 3 Mar 2021 17:06:12 +0100
Subject: [PATCH] podman: return OCF_NOT_RUNNING when monitor cmd fails (not
running)
---
heartbeat/podman | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/heartbeat/podman b/heartbeat/podman
index 82ea14624..5b707f3f5 100755
--- a/heartbeat/podman
+++ b/heartbeat/podman
@@ -204,14 +204,19 @@ monitor_cmd_exec()
# 125: no container with name or ID ${CONTAINER} found
# 126: container state improper (not running)
# 127: any other error
- if [ $rc -eq 125 ] || [ $rc -eq 126 ]; then
- rc=$OCF_NOT_RUNNING
- elif [ $rc -ne 0 ]; then
- ocf_exit_reason "monitor cmd failed (rc=$rc), output: $out"
- rc=$OCF_ERR_GENERIC
- else
- ocf_log debug "monitor cmd passed: exit code = $rc"
- fi
+ # 255: podman 2+: container not running
+ case "$rc" in
+ 125|126|255)
+ rc=$OCF_NOT_RUNNING
+ ;;
+ 0)
+ ocf_log debug "monitor cmd passed: exit code = $rc"
+ ;;
+ *)
+ ocf_exit_reason "monitor cmd failed (rc=$rc), output: $out"
+ rc=$OCF_ERR_GENERIC
+ ;;
+ esac
return $rc
}
......@@ -70,7 +70,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.1.1
Release: 90%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.5
Release: 90%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.6
License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
......@@ -270,6 +270,7 @@ Patch178: bz1940363-1-galera-redis-use-output-as.patch
Patch179: bz1940363-2-bundle-disable-validate-with.patch
Patch180: bz1943093-aws-vpc-move-ip-add-ENI-lookup.patch
Patch181: bz1973035-podman-fix-container-creation-race.patch
Patch182: bz1986868-podman-return-not-running-probe.patch
# bundle patches
Patch1000: 7-gcp-bundled.patch
......@@ -607,6 +608,7 @@ exit 1
%patch179 -p1
%patch180 -p1 -F2
%patch181 -p1
%patch182 -p1
chmod 755 heartbeat/nova-compute-wait
chmod 755 heartbeat/NovaEvacuate
......@@ -1170,6 +1172,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
%endif
%changelog
* Wed Jul 28 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-90.6
- podman: return NOT_RUNNING when monitor cmd fails
Resolves: rhbz#1986868
* Thu Jun 17 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-90.5
- podman: fix possible race during container creation
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment