From ce2c2f6c48658b773710d818a8948069393a818e Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Tue, 13 Aug 2024 16:08:20 +0200 Subject: [PATCH] - LVM-activate: fail when both "system_id_source" and "volume_list" are set in lvm.conf to avoid false positive activation of the VG Resolves: RHEL-22715 --- ...2715-LVM-activate-fix-false-positive.patch | 46 +++++++++++++++++++ resource-agents.spec | 10 +++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 RHEL-22715-LVM-activate-fix-false-positive.patch diff --git a/RHEL-22715-LVM-activate-fix-false-positive.patch b/RHEL-22715-LVM-activate-fix-false-positive.patch new file mode 100644 index 0000000..163afdd --- /dev/null +++ b/RHEL-22715-LVM-activate-fix-false-positive.patch @@ -0,0 +1,46 @@ +From 65a066cf9066390db65c4875e21c4c391793b9ae Mon Sep 17 00:00:00 2001 +From: Arslan Ahmad +Date: Tue, 16 Jan 2024 09:11:17 +0530 +Subject: [PATCH] Avoid false positive for VG activation + +When lvm.conf file has `volume_list` parameter configured and the +cluster is managing the shared storage using `system_id_source`, +then the activation of the LV fails to happen. However it is +reported as a success. + +The fixes will avoid starting of `LVM-activate` resource when +the cluster is configured with both `system_id_source` and +`volume_list`. + +Signed-off-by: Arslan Ahmad +--- + heartbeat/LVM-activate | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/heartbeat/LVM-activate b/heartbeat/LVM-activate +index f6f24a3b5..3858ed8dc 100755 +--- a/heartbeat/LVM-activate ++++ b/heartbeat/LVM-activate +@@ -448,6 +448,10 @@ systemid_check() + { + # system_id_source is set in lvm.conf + source=$(lvmconfig 'global/system_id_source' 2>/dev/null | cut -d"=" -f2) ++ ++ # Is volume_list set in lvm.conf ++ vol_list=$(lvmconfig 'activation/volume_list' 2>/dev/null | cut -d"=" -f2) ++ + if [ "$source" = "" ] || [ "$source" = "none" ]; then + ocf_exit_reason "system_id_source in lvm.conf is not set correctly!" + exit $OCF_ERR_ARGS +@@ -458,6 +462,11 @@ systemid_check() + exit $OCF_ERR_ARGS + fi + ++ if [ -n "$source" ] && [ -n "$vol_list" ]; then ++ ocf_exit_reason "Both system_id_source & volume_list cannot be defined!" ++ exit $OCF_ERR_ARGS ++ fi ++ + return $OCF_SUCCESS + } + diff --git a/resource-agents.spec b/resource-agents.spec index 6621e77..1539b45 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.10.0 -Release: 60%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 61%{?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 @@ -131,6 +131,7 @@ Patch78: RHEL-40393-Filesystem-1-dont-kill-unrelated-processes.patch Patch79: RHEL-40393-Filesystem-2-update-bsd-logic.patch Patch80: RHEL-32829-db2-fix-OCF_SUCESS-typo.patch Patch81: RHEL-43579-galera-mysql-redis-remove-Unpromoted-monitor-action.patch +Patch82: RHEL-22715-LVM-activate-fix-false-positive.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aws.patch @@ -336,6 +337,7 @@ exit 1 %patch -p1 -P 79 %patch -p1 -P 80 %patch -p1 -P 81 +%patch -p1 -P 82 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -657,6 +659,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Tue Aug 13 2024 Oyvind Albrigtsen - 4.10.0-61 +- LVM-activate: fail when both "system_id_source" and "volume_list" + are set in lvm.conf to avoid false positive activation of the VG + + Resolves: RHEL-22715 + * Fri Jun 28 2024 Oyvind Albrigtsen - 4.10.0-60 - IPsrcaddr: add IPv6 support - galera/mysql/redis: remove Unpromoted monitor-action