- all agents: dont check notify/promotable settings during
validate-action Resolves: rhbz#2157872
This commit is contained in:
parent
498b2fb2d6
commit
43220e7a1b
@ -1,7 +1,7 @@
|
|||||||
From 8388aca6aa13e4bef7c29261ac35cf3fb747fcb6 Mon Sep 17 00:00:00 2001
|
From 8388aca6aa13e4bef7c29261ac35cf3fb747fcb6 Mon Sep 17 00:00:00 2001
|
||||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
Date: Wed, 11 Jan 2023 13:22:24 +0100
|
Date: Wed, 11 Jan 2023 13:22:24 +0100
|
||||||
Subject: [PATCH 1/2] exportfs: move testdir() to start-action to avoid failing
|
Subject: [PATCH 1/3] exportfs: move testdir() to start-action to avoid failing
|
||||||
during resource creation (validate-all) and make it create the directory if
|
during resource creation (validate-all) and make it create the directory if
|
||||||
it doesnt exist
|
it doesnt exist
|
||||||
|
|
||||||
@ -79,7 +79,7 @@ index c10777fa9..2307a9e67 100755
|
|||||||
From a0b67ba60e5589c17a0ff4c296ec4235edb59bfd Mon Sep 17 00:00:00 2001
|
From a0b67ba60e5589c17a0ff4c296ec4235edb59bfd Mon Sep 17 00:00:00 2001
|
||||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
Date: Wed, 11 Jan 2023 13:25:57 +0100
|
Date: Wed, 11 Jan 2023 13:25:57 +0100
|
||||||
Subject: [PATCH 2/2] pgsql: dont run promotable checks during validate-all
|
Subject: [PATCH 2/3] pgsql: dont run promotable checks during validate-all
|
||||||
action
|
action
|
||||||
|
|
||||||
---
|
---
|
||||||
@ -116,3 +116,29 @@ index aa8a13a84..a99946af5 100755
|
|||||||
pgsql_validate_all
|
pgsql_validate_all
|
||||||
rc=$?
|
rc=$?
|
||||||
|
|
||||||
|
|
||||||
|
From 5c68e3315414071b22b95e909b0beaa7a90191bc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Mon, 23 Jan 2023 12:55:35 +0100
|
||||||
|
Subject: [PATCH 3/3] pgsql: dont fail validate-all action if config file isnt
|
||||||
|
available (could be on shared storage)
|
||||||
|
|
||||||
|
---
|
||||||
|
heartbeat/pgsql | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/heartbeat/pgsql b/heartbeat/pgsql
|
||||||
|
index a99946af5..626c1f737 100755
|
||||||
|
--- a/heartbeat/pgsql
|
||||||
|
+++ b/heartbeat/pgsql
|
||||||
|
@@ -1835,7 +1835,9 @@ check_config() {
|
||||||
|
|
||||||
|
if [ ! -f "$1" ]; then
|
||||||
|
if ocf_is_probe; then
|
||||||
|
- ocf_log info "Configuration file is $1 not readable during probe."
|
||||||
|
+ ocf_log info "Unable to read $1 during probe."
|
||||||
|
+ rc=1
|
||||||
|
+ elif [ "$OCF_CHECK_LEVEL" -lt 10 ]; then
|
||||||
|
rc=1
|
||||||
|
else
|
||||||
|
ocf_exit_reason "Configuration file $1 doesn't exist"
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
Name: resource-agents
|
Name: resource-agents
|
||||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||||
Version: 4.10.0
|
Version: 4.10.0
|
||||||
Release: 32%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
Release: 33%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
URL: https://github.com/ClusterLabs/resource-agents
|
URL: https://github.com/ClusterLabs/resource-agents
|
||||||
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
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
|
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jan 17 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-32
|
* Tue Jan 24 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-33
|
||||||
- all agents: dont check notify/promotable settings during
|
- all agents: dont check notify/promotable settings during
|
||||||
validate-action
|
validate-action
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user