rpms/resource-agents
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Filesystem: do not return CONFIGURED during monitor-action

Browse Source 
Resolves: RHEL-160863
This commit is contained in:
Oyvind Albrigtsen 2026-05-04 10:41:27 +02:00
parent 4fd2bff916
commit c075353665
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
RHEL-160863-Filesystem-do-not-return-CONFIGURED-during-monitor-action.patch Normal file
View File

@ -0,0 +1,27 @@
From 46e305ab4cb80fb6e28d2f8a1d90587d1cb1b549 Mon Sep 17 00:00:00 2001
From: SatomiOSAWA <satomi.t.osawa@gmail.com>
Date: Wed, 18 Mar 2026 09:32:05 +0900
Subject: [PATCH] Modify the return code when a mismatch between mount state
and configuration is detected in monitor operation.
---
heartbeat/Filesystem | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
index dda8e66e5..b4f16f17f 100755
--- a/heartbeat/Filesystem
+++ b/heartbeat/Filesystem
@@ -1029,7 +1029,11 @@ Filesystem_status()
rc=$OCF_NOT_RUNNING
else
ocf_exit_reason "Another device ($mounted_device) is already mounted on $MOUNTPOINT"
- rc=$OCF_ERR_CONFIGURED
+ if [ "$__OCF_ACTION" = "monitor" ]; then
+ rc=$OCF_ERR_GENERIC
+ else
+ rc=$OCF_ERR_CONFIGURED
+ fi
fi
fi
else

9
resource-agents.spec
View File

@ -45,7 +45,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.10.0
Release: 113%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 114%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
@ -206,6 +206,7 @@ Patch153: RHEL-153158-db2-set-reintegration-when-promotion-is-successful.patch
Patch154: RHEL-159203-podman-etcd-hardened-monitor-stop-actions.patch
Patch155: RHEL-148198-1-db2-fix-bashism.patch
Patch156: RHEL-148198-2-db2-do-not-use-db2stop-to-avoid-divergence-in-the-log.patch
Patch157: RHEL-160863-Filesystem-do-not-return-CONFIGURED-during-monitor-action.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch
@ -507,6 +508,7 @@ exit 1
%patch -p1 -P 154
%patch -p1 -P 155
%patch -p1 -P 156
%patch -p1 -P 157
# bundled ha-cloud-support libs
%patch -p1 -P 500
@ -841,6 +843,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Mon May 4 2026 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-114
- Filesystem: do not return CONFIGURED during monitor-action
Resolves: RHEL-160863
* Mon Apr 20 2026 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-113
- Cloud agents: change bundled lib paths to match changes in
ha-cloud-support