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

- Filesystem: always return OCF_ERR_GENERIC when another device is

Browse Source 
mounted on mountpoint to ensure relocation after trying to restart
  (default behaviour)

  Resolves: RHEL-160863
This commit is contained in:
Oyvind Albrigtsen 2026-05-13 10:05:33 +02:00
parent c075353665
commit 5da994c7cd
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
RHEL-160863-Filesystem-do-not-return-CONFIGURED-during-monitor-action.patch → RHEL-160863-1-Filesystem-do-not-return-CONFIGURED-during-monitor-action.patch
View File

28
RHEL-160863-2-Filesystem-always-return-OCF_ERR_GENERIC-when-another-device-is-mounted-on-mountpoint.patch Normal file
View File

@ -0,0 +1,28 @@
From f2cfc150da843a6c57bb6f6eebb4e44eb9d23213 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 13 May 2026 09:28:59 +0200
Subject: [PATCH] Filesystem: always return OCF_ERR_GENERIC when another device
is mounted on mountpoint to ensure relocation after trying to restart
(default behaviour)
---
heartbeat/Filesystem | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
index b4f16f17f..f7d2aa34b 100755
--- a/heartbeat/Filesystem
+++ b/heartbeat/Filesystem
@@ -1029,11 +1029,7 @@ Filesystem_status()
rc=$OCF_NOT_RUNNING
else
ocf_exit_reason "Another device ($mounted_device) is already mounted on $MOUNTPOINT"
- if [ "$__OCF_ACTION" = "monitor" ]; then
- rc=$OCF_ERR_GENERIC
- else
- rc=$OCF_ERR_CONFIGURED
- fi
+ rc=$OCF_ERR_GENERIC
fi
fi
else

12
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: 114%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 115%{?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,7 +206,8 @@ 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
Patch157: RHEL-160863-1-Filesystem-do-not-return-CONFIGURED-during-monitor-action.patch
Patch158: RHEL-160863-2-Filesystem-always-return-OCF_ERR_GENERIC-when-another-device-is-mounted-on-mountpoint.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch
@ -509,6 +510,7 @@ exit 1
%patch -p1 -P 155
%patch -p1 -P 156
%patch -p1 -P 157
%patch -p1 -P 158
# bundled ha-cloud-support libs
%patch -p1 -P 500
@ -843,8 +845,10 @@ 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
* Wed May 13 2026 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-115
- Filesystem: always return OCF_ERR_GENERIC when another device is
mounted on mountpoint to ensure relocation after trying to restart
(default behaviour)
Resolves: RHEL-160863