From d0c80cdeab3655c44cc6def70eab7487f614a58c Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Wed, 25 Jun 2025 13:20:30 +0200 Subject: [PATCH] - Filesystem: remove unreliable validate-all fstype check Resolves: RHEL-99743 --- ...tem-remove-validate-all-fstype-check.patch | 45 +++++++++++++++++++ resource-agents.spec | 9 +++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 RHEL-99743-Filesystem-remove-validate-all-fstype-check.patch diff --git a/RHEL-99743-Filesystem-remove-validate-all-fstype-check.patch b/RHEL-99743-Filesystem-remove-validate-all-fstype-check.patch new file mode 100644 index 0000000..12b82f6 --- /dev/null +++ b/RHEL-99743-Filesystem-remove-validate-all-fstype-check.patch @@ -0,0 +1,45 @@ +From 08c5b856a671b1583d3547dd76faf8a907485a12 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 19 Jun 2025 13:11:29 +0200 +Subject: [PATCH] Filesystem: remove validate-all fstype check, as there isnt a + reliable and portable way to check + +This check cause Warnings and might cause errors in future pcs versions +when running "pcs resource create". + +Example: +Warning: Validating resource options using the resource agent itself is enabled by default and produces warnings. In a future version, this might be changed to errors. Specify --agent-validation to switch to the future behavior. +Warning: Validation result from agent: + Jun 19 06:13:45 INFO: It seems we do not have ext3 support +--- + heartbeat/Filesystem | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem +index d10e5a714..6d3960162 100755 +--- a/heartbeat/Filesystem ++++ b/heartbeat/Filesystem +@@ -978,23 +978,6 @@ Filesystem_monitor() + # + Filesystem_validate_all() + { +- # Check if the $FSTYPE is workable +- # NOTE: Without inserting the $FSTYPE module, this step may be imprecise +- # TODO: This is Linux specific crap. +- if [ ! -z "$FSTYPE" -a "$FSTYPE" != none ]; then +- cut -f2 /proc/filesystems | grep "^${FSTYPE}$" >/dev/null 2>&1 +- if [ $? -ne 0 ]; then +- modpath=/lib/modules/$(uname -r) +- moddep=$modpath/modules.dep +- # Do we have $FSTYPE in modules.dep? +- cut -d' ' -f1 $moddep \ +- | grep "^${modpath}.*${FSTYPE}\.k\?o:$" >/dev/null 2>&1 +- if [ $? -ne 0 ]; then +- ocf_log info "It seems we do not have $FSTYPE support" +- fi +- fi +- fi +- + # If we are supposed to do monitoring with status files, then + # we need a utility to write in O_DIRECT mode. + if [ $OCF_CHECK_LEVEL -gt 0 ]; then diff --git a/resource-agents.spec b/resource-agents.spec index cac81c2..58460bc 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.16.0 -Release: 18%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 19%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -74,6 +74,7 @@ Patch21: RHEL-13089-2-crypt-fix-crypt_type-check-and-usage.patch Patch22: RHEL-88538-Filesystem-avoid-chance-of-getting-the-wrong-bind-mount.patch Patch23: RHEL-93680-IPaddr2-IPsrcaddr-avoid-duplicate-route-issues.patch Patch24: RHEL-85014-IPaddr2-add-link-status-DOWN-LOWERLAYERDOWN-check.patch +Patch25: RHEL-99743-Filesystem-remove-validate-all-fstype-check.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aliyun.patch @@ -257,6 +258,7 @@ exit 1 %patch -p1 -P 22 %patch -p1 -P 23 %patch -p1 -P 24 +%patch -p1 -P 25 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -587,6 +589,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Wed Jun 25 2025 Oyvind Albrigtsen - 4.16.0-19 +- Filesystem: remove unreliable validate-all fstype check + + Resolves: RHEL-99743 + * Tue Jun 17 2025 Oyvind Albrigtsen - 4.16.0-18 - IPaddr2/IPsrcaddr: fix to avoid duplicate route issues - IPaddr2: add link status DOWN/LOWERLAYERDOWN check