Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package resource-agents for openSUSE:Factory
checked in at 2023-01-26 13:57:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/resource-agents (Old)
and /work/SRC/openSUSE:Factory/.resource-agents.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents"
Thu Jan 26 13:57:00 2023 rev:121 rq:1060963 version:4.12.0+git3.5c81805c
Changes:
--------
--- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes
2022-12-17 20:36:01.908435775 +0100
+++
/work/SRC/openSUSE:Factory/.resource-agents.new.32243/resource-agents.changes
2023-01-26 14:09:57.204101622 +0100
@@ -2 +2,16 @@
-Wed Dec 14 10:17:45 UTC 2022 - Peter Varkoly <[email protected]>
+Wed Jan 25 13:30:26 UTC 2023 - Peter Varkoly <[email protected]>
+
+- Update to version 4.12.0+git3.5c81805c:
+ * db2: avoid eval with unsanitized values (#1838) (bsc#1146789)
+ * build: update ChangeLog for 4.12.0
+ * build: update ChangeLog for 4.12.0-rc1
+ * README: update IRC info (#1835)
+ * CTDB: change public_addresses validate-all warning to info
+ * Filesystem: remove validate-all mountpoint warning as it is auto-created
during start-action if it doesnt exist
+ * galera/mpathpersist/sg_persist/IPsrcaddr: only check notify and promotable
when OCF_CHECK_LEVEL=10
+ * WAS6: fix trap condition
+ * exportfs: fix the error handling during monitoring
+ * IPaddr2/IPsrcaddr: add/modify table parameter to be able to find interface
while using policy based routing
+
+-------------------------------------------------------------------
+Wed Dec 14 10:43:42 UTC 2022 - [email protected]
@@ -4,2 +18,0 @@
-- Remove ocf_heartbeat_ZFS (bsc#1205556)
- A new package resource-agents-zfs will contain ZFS support, which will not
be shipped on SLES.
@@ -7,2 +20,4 @@
- * Please don't suggest /tmp/mysql-proxy.sock, that is bad practice. Use one
of the directories where this socket can be provided securely (bsc#1146768)
- * SAPInstance: be more resilient against broken kill.sap files (#1825)
(bsc#1206100)
+ * Please don't suggest /tmp/mysql-proxy.sock, that is bad practice. Use one
of the directories where this socket can be provided securely
+ (bsc#1146768)
+ * SAPInstance: be more resilient against broken kill.sap files (#1825)
+ (bsc#1206100)
@@ -11 +26 @@
- * mysql-common: return error in stop-action if kill fails to stop the
process, so the node can get fenced
+ * mysql-common: return error in stop-action if kill fails to stop the
process so the node can get fenced
@@ -14 +29 @@
- * vdo-vol: dont fail probe action when the underlying device doesnt exist
+ * vdo-vol: don't fail probe action when the underlying device doesn't exist
@@ -19 +34 @@
-Thu Oct 20 08:40:50 UTC 2022 - [email protected]
+Wed Nov 30 10:58:20 UTC 2022 - Peter Varkoly <[email protected]>
@@ -21 +36,8 @@
-- Update to version 4.11.0+git72.c1f0a07e:
+- Remove ocf_heartbeat_ZFS (bsc#1205556)
+ A new package resource-agents-zfs will contain ZFS support, which will not
be shipped on SLES.
+
+-------------------------------------------------------------------
+Tue Oct 25 05:29:06 UTC 2022 - Peter Varkoly <[email protected]>
+
+- Impl: AWS EFS Support in Filesystem OCF required (jsc#PED-1934)
+ Update to version 4.11.0+git72.c1f0a07e:
@@ -31,5 +52,0 @@
-
--------------------------------------------------------------------
-Fri Sep 02 05:15:56 UTC 2022 - [email protected]
-
-- Update to version 4.11.0+git58.2a2a4dd2:
@@ -70,10 +86,0 @@
-
--------------------------------------------------------------------
-Thu May 26 10:14:58 UTC 2022 - Jan Engelhardt <[email protected]>
-
-- Adjust BuildRequire libglue-devel -> cluster-glue-devel.
-
--------------------------------------------------------------------
-Wed May 18 07:36:56 UTC 2022 - [email protected]
-
-- Update to version 4.11.0+git11.a5f40b4c:
@@ -82,5 +88,0 @@
-
--------------------------------------------------------------------
-Sun May 01 22:04:58 UTC 2022 - [email protected]
-
-- Update to version 4.11.0+git8.2351f1d4:
@@ -96,10 +97,0 @@
-
--------------------------------------------------------------------
-Wed Apr 6 13:57:27 UTC 2022 - Roger Zhou <[email protected]>
-
-- Drop obs resource-agents.conf and reuse the one in upstream commit 826c5532
-
--------------------------------------------------------------------
-Thu Mar 31 14:22:18 UTC 2022 - [email protected]
-
-- Update to version v4.11.0rc1+git2.d40f1f1b:
@@ -124 +116 @@
- * ocf-shellfuncs: Parametrise the log destinarion by OCF_RESKEY_trace_dir
(jsc#PED-121)
+ * ocf-shellfuncs: Parametrise the log destinarion by OCF_RESKEY_trace_dir
@@ -157,0 +150,41 @@
+ - Adjust BuildRequire libglue-devel -> cluster-glue-devel.
+ - Drop obs resource-agents.conf and reuse the one in upstream commit 826c5532
+ - Remove patches contained by the new version:
+ 0002-IPaddr2-Allow-to-send-IPv6-Neighbor-Advertisements-i.patch
+ 0001-mariadb-Remove-obsolete-DEBUG_LOG-functionality-1191.patch
+ 0001-Improve-the-error-message-if-monpassword-was-not-set.patch
+ 0004-IPaddr2-Clarify-behavior-of-arp_-parameters-for-IPv4.patch
+ 0001-aws-vpc-move-ip-Allow-to-set-the-interface-label.patch
+ 0003-IPaddr2-Log-ip-addr-add-options-together.patch
+ 0001-IPaddr2-Allow-to-disable-Duplicate-Address-Detection.patch
+
+
+-------------------------------------------------------------------
+Wed Jul 6 08:49:24 UTC 2022 - Peter Varkoly <[email protected]>
+
+- AUDIT-FIND: resource-agents: Predictable log file in /tmp in mariadb.in
+ (bsc#1146691)
+ Add patch:
+ 0001-mariadb-Remove-obsolete-DEBUG_LOG-functionality-1191.patch
+
+-------------------------------------------------------------------
+Thu Jun 9 07:38:59 UTC 2022 - Peter Varkoly <[email protected]>
+
+- RA aws-vpc-move-ip is lacking the possibility to assign a label to an
interface.
+ (bsc#1199766) Include upsteam patch:
+ 0001-aws-vpc-move-ip-Allow-to-set-the-interface-label.patch
+- Can IPaddr2 run ARP for IPV6 in background during start operation
+ (bsc#1196164)
+ Include upstream patches:
+ 0001-IPaddr2-Allow-to-disable-Duplicate-Address-Detection.patch
+ 0002-IPaddr2-Allow-to-send-IPv6-Neighbor-Advertisements-i.patch
+ 0003-IPaddr2-Log-ip-addr-add-options-together.patch
+ 0004-IPaddr2-Clarify-behavior-of-arp_-parameters-for-IPv4.patch
+
+-------------------------------------------------------------------
+Sun May 1 21:54:26 UTC 2022 - Peter Varkoly <[email protected]>
+
+- oracle RA lists monpassword as optional but fails unless provided
+ (bsc#1197956)
+ Add upstream patch:
+ 0001-Improve-the-error-message-if-monpassword-was-not-set.patch
Old:
----
resource-agents-4.11.0+git90.c1dd3806.tar.xz
New:
----
resource-agents-4.12.0+git3.5c81805c.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ resource-agents.spec ++++++
--- /var/tmp/diff_new_pack.1nPp1i/_old 2023-01-26 14:09:57.820104935 +0100
+++ /var/tmp/diff_new_pack.1nPp1i/_new 2023-01-26 14:09:57.824104957 +0100
@@ -1,7 +1,7 @@
#
# spec file for package resource-agents
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: resource-agents
-Version: 4.11.0+git90.c1dd3806
+Version: 4.12.0+git3.5c81805c
Release: 0
Summary: HA Reusable Cluster Resource Scripts
License: GPL-2.0-only AND LGPL-2.1-or-later AND GPL-3.0-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.1nPp1i/_old 2023-01-26 14:09:57.872105215 +0100
+++ /var/tmp/diff_new_pack.1nPp1i/_new 2023-01-26 14:09:57.876105237 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/resource-agents.git</param>
-<param name="changesrevision">e7822f35256d57d6d3eb8b01ef41817de5363ab8</param>
+<param name="changesrevision">5c81805c1d23f8ee58634512e26395415fc3fd58</param>
</service>
</servicedata>
(No newline at EOF)
++++++ resource-agents-4.11.0+git90.c1dd3806.tar.xz ->
resource-agents-4.12.0+git3.5c81805c.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.11.0+git90.c1dd3806/ChangeLog
new/resource-agents-4.12.0+git3.5c81805c/ChangeLog
--- old/resource-agents-4.11.0+git90.c1dd3806/ChangeLog 2022-12-13
14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/ChangeLog 2023-01-25
12:32:16.000000000 +0100
@@ -1,3 +1,65 @@
+* Wed Jan 25 2023 resource-agents contributors
+- stable release 4.12.0
+
+* Wed Jan 18 2023 resource-agents contributors
+- release candidate 4.12.0 rc1
+- azure-events-az: new resource agent (#1774)
+- iface-macvlan: new resource agent (#1815)
+- configure/spec: remove google-api-client BuildReq as the gcp-agents build
fine without it
+- configure: fix bashisms
+- dev-guide: update default branch name
+- ocf-shellfuncs: add ocf_promotion_score() to use crm_attribute -p/crm_master
depending on Pacemaker version
+- spec: remove redhat-lsb-core dependency (lsb_release)
+- spec: use cluster-glue-devel for opensuse > 15
+- all agents: update to promotable terms
+- CTDB: change public_addresses validate-all warning to info
+- CTDB: move process to root cgroup if realtime scheduling is enabled
+- Filesystem: improve logic for UUID/label and add note that
/dev/disk/by-{uuid,label}/ are preferred on Linux
+- Filesystem: remove validate-all mountpoint warning as it is auto-created
during start-action if it doesnt exist
+- IPsrcaddr: detect metric for main table only, and allow specifying metric if
necessary
+- IPsrcaddr: fix PROTO regex
+- IPsrcaddr: fix monitor/status for default route not being equal to src IP
before start, and change route src correctly in stop-action
+- IPsrcaddr: use scope host when using non-main tables
+- LVM-activate: use correct return codes to ensure correct action when failing
+- SAPInstance: be more resilient against broken kill.sap files (#1825)
+- VirtualDomain: replace error log messages with calls to ocf_exit_reason
+- WAS6: add missing ] to fix trap condition
+- aws-vpc-move-ip: allow to set the interface label
+- dnsupdate: add CNAME support (#1773)
+- docker-compose: fix number of containers/running containers logic
+- docker/podman/zabbixserver: replace error log messages with calls to
ocf_exit_reason
+- ethmonitor/ovsmonitor/mariadb: check for bc binary
+- ethmonitor/ovsmonitor/pgsql: remove ignored attrd_updater "-q" parameter
+- exportfs: only grep in rmtab if it exists
+- galera/mariadb/mpathpersist/mysql/pgsql/sg_persist/Stateful: use
ocf_promotion_score() to avoid issues with deprecated crm_master
+- galera/mpathpersist/sg_persist/IPsrcaddr: only check notify and promotable
when OCF_CHECK_LEVEL=10
+- iSCSILogicalUnit: fix issue where resource was in stopped state when using
allowed_initiators parameter (#1766)
+- lvmlockd: add "use_lvmlockd = 1" if it's commented out or missing
+- lvmlockd: fail when use_lvmlockd has not been set
+- mariadb: remove obsolete DEBUG_LOG functionality #1191
+- mysql-common: return error in stop-action if kill fails to stop the process,
so the node can get fenced
+- mysql-proxy: update metadata to suggest secure location instead of
/tmp/mysql-proxy.sock
+- nfsserver: add nfsv4_only parameter to make it run without rpc-statd/rpcbind
services
+- ocf-tester: remove deprecated lrmd/lrmadmin code that hasnt worked since
pre-pacemaker days
+- ocf-tester: use promotable terms
+- openstack-agents: set domain parameter's default to Default and fix missing
parameter name in ocf_exit_reason
+- openstack-agents: warn when openstackcli is slow
+- openstack-cinder-volume: dont do volume_local_check during start/stop-action
+- openstack-floating-ip/openstack-virtual-ip: dont fail in validate() during
probe-calls
+- openstack-floating-ip: fix awk only catching last id for node_port_ids
+- oracle: improve the error message if monpassword was not set. (#1767)
+- podman: add podman parameter error judgment (#1764)
+- portblock: implement blocking of outgoing ports
+- rabbitmq-server-ha: dont mkdir -p when getting meta-data or help
+- storage_mon: use the O_DIRECT flag in open() to eliminate cache effects
+- storage_mon: do random lseek even with O_DIRECT, etc
+- storage_mon: fix bug in checking of number of specified scores.
+- storage_mon: fix build-related issues
+- storage_mon: improve error messages when ioctl() fails
+- storage_mon: make -h exit just after printing help message (#1791)
+- storage_mon: fix bug in handling of child process exit
+- vdo-vol: dont fail probe action when the underlying device doesnt exist
+
* Wed Apr 6 2022 resource-agents contributors
- stable release 4.11.0
- Filesystem: fix logic for UUID/label devices with space between parameter
and UUID/label
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.11.0+git90.c1dd3806/README.md
new/resource-agents-4.12.0+git3.5c81805c/README.md
--- old/resource-agents-4.11.0+git90.c1dd3806/README.md 2022-12-13
14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/README.md 2023-01-25
12:32:16.000000000 +0100
@@ -18,4 +18,4 @@
* [ClusterLabs website](http://www.clusterlabs.org/)
* [OCF Resource Agent Developer's
guide](https://github.com/ClusterLabs/resource-agents/blob/master/doc/dev-guides/ra-dev-guide.asc)
* Mailing lists for [users](http://oss.clusterlabs.org/mailman/listinfo/users)
and [developers](http://oss.clusterlabs.org/mailman/listinfo/developers)
-* #clusterlabs IRC channel on [freenode](http://freenode.net/)
+* #clusterlabs IRC channel on [Libera.Chat](https://libera.chat/)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/CTDB.in
new/resource-agents-4.12.0+git3.5c81805c/heartbeat/CTDB.in
--- old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/CTDB.in 2022-12-13
14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/heartbeat/CTDB.in 2023-01-25
12:32:16.000000000 +0100
@@ -940,7 +940,7 @@
fi
if [ -f "${OCF_RESKEY_ctdb_config_dir}/public_addresses" ]; then
- ocf_log warn "CTDB file
'${OCF_RESKEY_ctdb_config_dir}/public_addresses' exists - CTDB will try to
manage IP failover!"
+ ocf_log info "CTDB file
'${OCF_RESKEY_ctdb_config_dir}/public_addresses' exists - CTDB will try to
manage IP failover!"
fi
if [ ! -f "$OCF_RESKEY_ctdb_config_dir/nodes" ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/Filesystem
new/resource-agents-4.12.0+git3.5c81805c/heartbeat/Filesystem
--- old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/Filesystem
2022-12-13 14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/heartbeat/Filesystem
2023-01-25 12:32:16.000000000 +0100
@@ -851,10 +851,6 @@
#
Filesystem_validate_all()
{
- if [ -n "$MOUNTPOINT" ] && [ ! -d "$MOUNTPOINT" ]; then
- ocf_log warn "Mountpoint $MOUNTPOINT does not exist"
- fi
-
# Check if the $FSTYPE is workable
# NOTE: Without inserting the $FSTYPE module, this step may be imprecise
# TODO: This is Linux specific crap.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/IPaddr2
new/resource-agents-4.12.0+git3.5c81805c/heartbeat/IPaddr2
--- old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/IPaddr2 2022-12-13
14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/heartbeat/IPaddr2 2023-01-25
12:32:16.000000000 +0100
@@ -73,6 +73,7 @@
OCF_RESKEY_cidr_netmask_default=""
OCF_RESKEY_broadcast_default=""
OCF_RESKEY_iflabel_default=""
+OCF_RESKEY_table_default=""
OCF_RESKEY_cidr_netmask_default=""
OCF_RESKEY_lvs_support_default=false
OCF_RESKEY_lvs_ipv6_addrlabel_default=false
@@ -97,6 +98,7 @@
: ${OCF_RESKEY_cidr_netmask=${OCF_RESKEY_cidr_netmask_default}}
: ${OCF_RESKEY_broadcast=${OCF_RESKEY_broadcast_default}}
: ${OCF_RESKEY_iflabel=${OCF_RESKEY_iflabel_default}}
+: ${OCF_RESKEY_table=${OCF_RESKEY_table_default}}
: ${OCF_RESKEY_lvs_support=${OCF_RESKEY_lvs_support_default}}
: ${OCF_RESKEY_lvs_ipv6_addrlabel=${OCF_RESKEY_lvs_ipv6_addrlabel_default}}
:
${OCF_RESKEY_lvs_ipv6_addrlabel_value=${OCF_RESKEY_lvs_ipv6_addrlabel_value_default}}
@@ -239,6 +241,16 @@
<content type="string" default="${OCF_RESKEY_iflabel_default}"/>
</parameter>
+<parameter name="table">
+<longdesc lang="en">
+Table to use to lookup which interface to use for the IP.
+
+This can be used for policy based routing. See man ip-rule(8).
+</longdesc>
+<shortdesc lang="en">Table</shortdesc>
+<content type="string" default="${OCF_RESKEY_table_default}" />
+</parameter>
+
<parameter name="lvs_support">
<longdesc lang="en">
Enable support for LVS Direct Routing configurations. In case a IP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/IPsrcaddr
new/resource-agents-4.12.0+git3.5c81805c/heartbeat/IPsrcaddr
--- old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/IPsrcaddr
2022-12-13 14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/heartbeat/IPsrcaddr
2023-01-25 12:32:16.000000000 +0100
@@ -155,13 +155,16 @@
<parameter name="table">
<longdesc lang="en">
-Table to modify. E.g. "local".
+Table to modify and use for interface lookup. E.g. "local".
The table has to have a route matching the "destination" parameter.
+
+This can be used for policy based routing. See man ip-rule(8).
</longdesc>
<shortdesc lang="en">Table</shortdesc>
<content type="string" default="${OCF_RESKEY_table_default}" />
</parameter>
+
</parameters>
<actions>
@@ -510,11 +513,13 @@
fi
# We should serve this IP address of course
- if ip_status "$ipaddress"; then
- :
- else
- ocf_exit_reason "We are not serving [$ipaddress], hence can not make
it a preferred source address"
- return $OCF_ERR_INSTALLED
+ if [ "$OCF_CHECK_LEVEL" -eq 10 ]; then
+ if ip_status "$ipaddress"; then
+ :
+ else
+ ocf_exit_reason "We are not serving [$ipaddress], hence
can not make it a preferred source address"
+ return $OCF_ERR_INSTALLED
+ fi
fi
return $OCF_SUCCESS
}
@@ -540,6 +545,7 @@
ipaddress="$OCF_RESKEY_ipaddress"
+[ "$__OCF_ACTION" != "validate-all" ] && OCF_CHECK_LEVEL=10
srca_validate_all
rc=$?
if [ $rc -ne $OCF_SUCCESS ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/WAS6
new/resource-agents-4.12.0+git3.5c81805c/heartbeat/WAS6
--- old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/WAS6 2022-12-13
14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/heartbeat/WAS6 2023-01-25
12:32:16.000000000 +0100
@@ -295,7 +295,7 @@
# This is actually faster than WAS_status above...
#
WAS_monitor() {
- trap '[ -z "$tmpfile" || rmtempfile "$tmpfile"' 0
+ trap '[ -z "$tmpfile" ] || rmtempfile "$tmpfile"' 0
tmpfile=`maketempfile` || exit 1
SnoopPort=`GetWASSnoopPort $1`
output=`$WGET -nv -O$tmpfile http://localhost:$SnoopPort/snoop 2>&1`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/db2
new/resource-agents-4.12.0+git3.5c81805c/heartbeat/db2
--- old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/db2 2022-12-13
14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/heartbeat/db2 2023-01-25
12:32:16.000000000 +0100
@@ -326,9 +326,11 @@
/First active log file/ {printf "FIRST_ACTIVE_LOG='%s'\n", $NF;}
/HADR_PEER_WINDOW/ {printf "HADR_PEER_WINDOW='%s'\n", $NF;}')
-
# sets HADR_ROLE HADR_TIMEOUT HADR_PEER_WINDOW
- eval $hadr_vars
+ HADR_ROLE=$(echo "$output" | awk '/HADR database role/ {print $NF;}')
+ HADR_TIMEOUT=$(echo "$output" | awk '/HADR_TIMEOUT/ {print $NF;}')
+ FIRST_ACTIVE_LOG=$(echo "$output" | awk '/First active log file/ {print
$NF;}')
+ HADR_PEER_WINDOW=$(echo "$output" | awk '/HADR_PEER_WINDOW/ {print $NF;}')
# HADR_PEER_WINDOW comes with V9 and is checked later
if [ -z "$HADR_ROLE" -o -z "$HADR_TIMEOUT" ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/exportfs
new/resource-agents-4.12.0+git3.5c81805c/heartbeat/exportfs
--- old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/exportfs
2022-12-13 14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/heartbeat/exportfs 2023-01-25
12:32:16.000000000 +0100
@@ -218,7 +218,9 @@
local dir=$1
local rmtab_backup
rmtab_backup="$dir/${OCF_RESKEY_rmtab_backup}"
- grep ":$dir:" /var/lib/nfs/rmtab > ${rmtab_backup}
+ if [ -r /var/lib/nfs/rmtab ]; then
+ grep ":$dir:" /var/lib/nfs/rmtab > ${rmtab_backup}
+ fi
}
restore_rmtab() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/findif.sh
new/resource-agents-4.12.0+git3.5c81805c/heartbeat/findif.sh
--- old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/findif.sh
2022-12-13 14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/heartbeat/findif.sh
2023-01-25 12:32:16.000000000 +0100
@@ -32,7 +32,7 @@
getnetworkinfo()
{
local line netinfo
- ip -o -f inet route list match $OCF_RESKEY_ip table local scope host |
(while read line;
+ ip -o -f inet route list match $OCF_RESKEY_ip table
"${OCF_RESKEY_table=local}" scope host | (while read line;
do
netinfo=`echo $line | awk '{print $2}'`
case $netinfo in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/galera.in
new/resource-agents-4.12.0+git3.5c81805c/heartbeat/galera.in
--- old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/galera.in
2022-12-13 14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/heartbeat/galera.in
2023-01-25 12:32:16.000000000 +0100
@@ -1015,9 +1015,11 @@
galera_validate()
{
- if ! ocf_is_ms; then
- ocf_exit_reason "Galera must be configured as a multistate
Master/Slave resource."
- return $OCF_ERR_CONFIGURED
+ if [ "$OCF_CHECK_LEVEL" -eq 10 ]; then
+ if ! ocf_is_ms; then
+ ocf_exit_reason "Galera must be configured as a multistate
Master/Slave resource."
+ return $OCF_ERR_CONFIGURED
+ fi
fi
if [ -z "$OCF_RESKEY_wsrep_cluster_address" ]; then
@@ -1035,6 +1037,7 @@
exit $OCF_SUCCESS;;
esac
+[ "$__OCF_ACTION" = "start" ] && OCF_CHECK_LEVEL=10
galera_validate
rc=$?
LSB_STATUS_STOPPED=3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/mpathpersist.in
new/resource-agents-4.12.0+git3.5c81805c/heartbeat/mpathpersist.in
--- old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/mpathpersist.in
2022-12-13 14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/heartbeat/mpathpersist.in
2023-01-25 12:32:16.000000000 +0100
@@ -630,10 +630,11 @@
}
mpathpersist_action_validate_all () {
-
- if [ "$OCF_RESKEY_CRM_meta_master_max" != "1" ] && [ "$RESERVATION_TYPE"
!= "7" ] && [ "$RESERVATION_TYPE" != "8" ]; then
- ocf_log err "Master options misconfigured."
- exit $OCF_ERR_CONFIGURED
+ if [ "$OCF_CHECK_LEVEL" -eq 10 ]; then
+ if [ "$OCF_RESKEY_CRM_meta_master_max" != "1" ] && [
"$RESERVATION_TYPE" != "7" ] && [ "$RESERVATION_TYPE" != "8" ]; then
+ ocf_log err "Master options misconfigured."
+ exit $OCF_ERR_CONFIGURED
+ fi
fi
return $OCF_SUCCESS
@@ -659,6 +660,10 @@
start|promote|monitor|stop|demote)
ocf_log debug "$RESOURCE: starting action \"$ACTION\""
mpathpersist_init
+ if [ "$__OCF_ACTION" = "start" ]; then
+ OCF_CHECK_LEVEL=10
+ mpathpersist_action_validate_all
+ fi
mpathpersist_action_$ACTION
exit $?
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/sg_persist.in
new/resource-agents-4.12.0+git3.5c81805c/heartbeat/sg_persist.in
--- old/resource-agents-4.11.0+git90.c1dd3806/heartbeat/sg_persist.in
2022-12-13 14:48:10.000000000 +0100
+++ new/resource-agents-4.12.0+git3.5c81805c/heartbeat/sg_persist.in
2023-01-25 12:32:16.000000000 +0100
@@ -643,10 +643,11 @@
}
sg_persist_action_validate_all () {
-
- if [ "$OCF_RESKEY_CRM_meta_master_max" != "1" ] && [ "$RESERVATION_TYPE"
!= "7" ] && [ "$RESERVATION_TYPE" != "8" ]; then
- ocf_log err "Master options misconfigured."
- exit $OCF_ERR_CONFIGURED
+ if [ "$OCF_CHECK_LEVEL" -eq 10 ]; then
+ if [ "$OCF_RESKEY_CRM_meta_master_max" != "1" ] && [
"$RESERVATION_TYPE" != "7" ] && [ "$RESERVATION_TYPE" != "8" ]; then
+ ocf_log err "Master options misconfigured."
+ exit $OCF_ERR_CONFIGURED
+ fi
fi
return $OCF_SUCCESS
@@ -672,6 +673,10 @@
start|promote|monitor|stop|demote)
ocf_log debug "$RESOURCE: starting action \"$ACTION\""
sg_persist_init
+ if [ "$__OCF_ACTION" = "start" ]; then
+ OCF_CHECK_LEVEL=10
+ sg_persist_action_validate_all
+ fi
sg_persist_action_$ACTION
exit $?
;;
