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

- all agents: dont check notify/promotable settings during

Browse Source 
validate-action

  Resolves: rhbz#2157872
This commit is contained in:
Oyvind Albrigtsen 2023-01-17 15:01:10 +01:00
parent d56d948ec2
commit 498b2fb2d6
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bz2157872-4-exportfs-pgsql-validate-all-fixes.patch
View File

@ -1,4 +1,4 @@
From 8b78251b24446c0a603a533ecc0b632dd14c752b Mon Sep 17 00:00:00 2001
From 8388aca6aa13e4bef7c29261ac35cf3fb747fcb6 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 11 Jan 2023 13:22:24 +0100
Subject: [PATCH 1/2] exportfs: move testdir() to start-action to avoid failing
@ -6,11 +6,11 @@ Subject: [PATCH 1/2] exportfs: move testdir() to start-action to avoid failing
it doesnt exist
---
heartbeat/exportfs | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
heartbeat/exportfs | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/heartbeat/exportfs b/heartbeat/exportfs
index c10777fa9..e0b66b9ee 100755
index c10777fa9..2307a9e67 100755
--- a/heartbeat/exportfs
+++ b/heartbeat/exportfs
@@ -301,6 +301,16 @@ exportfs_monitor ()
@ -66,8 +66,17 @@ index c10777fa9..e0b66b9ee 100755
}
for dir in $OCF_RESKEY_directory; do
@@ -466,7 +469,7 @@ for dir in $OCF_RESKEY_directory; do
fi
else
case "$__OCF_ACTION" in
- stop|monitor)
+ stop|monitor|validate-all)
canonicalized_dir="$dir"
ocf_log debug "$dir does not exist"
;;
From 8acbd8ea5a87a8adc33f47a06f8b0fb4a006cbe8 Mon Sep 17 00:00:00 2001
From a0b67ba60e5589c17a0ff4c296ec4235edb59bfd Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 11 Jan 2023 13:25:57 +0100
Subject: [PATCH 2/2] pgsql: dont run promotable checks during validate-all

4
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: 31%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 32%{?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
@ -581,7 +581,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Mon Jan 16 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-31
* Tue Jan 17 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-32
- all agents: dont check notify/promotable settings during
validate-action