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-03-19 16:15:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/resource-agents (Old)
and /work/SRC/openSUSE:Factory/.resource-agents.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents"
Sun Mar 19 16:15:54 2023 rev:122 rq:1072482 version:4.12.0+git10.fe1a2f88
Changes:
--------
--- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes
2023-01-26 14:09:57.204101622 +0100
+++
/work/SRC/openSUSE:Factory/.resource-agents.new.31432/resource-agents.changes
2023-03-19 16:15:56.691137264 +0100
@@ -1,0 +2,9 @@
+Thu Mar 16 14:16:12 UTC 2023 - [email protected]
+
+- Update to version 4.12.0+git10.fe1a2f88:
+ * Mid: ocf-shellfuncs: Explicitly specify $OCF_RESOURCE_INSTANCE in the p
parameter for compatibility.
+ * nfsserver: fix "server scope" functionality to live with additional
drop-in files
+ * pgsql: dont run promotable and file checks that could be on shared storage
during validate-all action
+ * exportfs: move testdir() to start-action to avoid failing during resource
creation (validate-all) and make it create the directory if it doesnt exist
+
+-------------------------------------------------------------------
Old:
----
resource-agents-4.12.0+git3.5c81805c.tar.xz
New:
----
resource-agents-4.12.0+git10.fe1a2f88.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ resource-agents.spec ++++++
--- /var/tmp/diff_new_pack.6FpSrS/_old 2023-03-19 16:15:57.451140960 +0100
+++ /var/tmp/diff_new_pack.6FpSrS/_new 2023-03-19 16:15:57.455140979 +0100
@@ -17,7 +17,7 @@
Name: resource-agents
-Version: 4.12.0+git3.5c81805c
+Version: 4.12.0+git10.fe1a2f88
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.6FpSrS/_old 2023-03-19 16:15:57.511141251 +0100
+++ /var/tmp/diff_new_pack.6FpSrS/_new 2023-03-19 16:15:57.515141270 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/resource-agents.git</param>
-<param name="changesrevision">5c81805c1d23f8ee58634512e26395415fc3fd58</param>
+<param name="changesrevision">76cc4da4818570fd9511bc620ff6bea418d6d8b5</param>
</service>
</servicedata>
(No newline at EOF)
++++++ resource-agents-4.12.0+git3.5c81805c.tar.xz ->
resource-agents-4.12.0+git10.fe1a2f88.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.12.0+git3.5c81805c/heartbeat/exportfs
new/resource-agents-4.12.0+git10.fe1a2f88/heartbeat/exportfs
--- old/resource-agents-4.12.0+git3.5c81805c/heartbeat/exportfs 2023-01-25
12:32:16.000000000 +0100
+++ new/resource-agents-4.12.0+git10.fe1a2f88/heartbeat/exportfs
2023-03-13 15:12:01.000000000 +0100
@@ -301,6 +301,16 @@
fi
}
+testdir() {
+ if [ ! -d $1 ]; then
+ mkdir -p "$1"
+ if [ $? -ne 0 ]; then
+ ocf_exit_reason "Unable to create directory $1"
+ return 1
+ fi
+ fi
+ return 0
+}
export_one() {
local dir=$1
local opts sep
@@ -331,6 +341,10 @@
}
exportfs_start ()
{
+ if ! forall testdir; then
+ return $OCF_ERR_INSTALLED
+ fi
+
if exportfs_monitor; then
ocf_log debug "already exported"
return $OCF_SUCCESS
@@ -428,14 +442,6 @@
fi
}
-testdir() {
- if [ ! -d $1 ]; then
- ocf_is_probe ||
- ocf_log err "$1 does not exist or is not a directory"
- return 1
- fi
- return 0
-}
exportfs_validate_all ()
{
if echo "$OCF_RESKEY_fsid" | grep -q -F ','; then
@@ -447,9 +453,6 @@
ocf_exit_reason "use integer fsid when exporting multiple
directories"
return $OCF_ERR_CONFIGURED
fi
- if ! forall testdir; then
- return $OCF_ERR_INSTALLED
- fi
}
for dir in $OCF_RESKEY_directory; do
@@ -466,7 +469,7 @@
fi
else
case "$__OCF_ACTION" in
- stop|monitor)
+ stop|monitor|validate-all)
canonicalized_dir="$dir"
ocf_log debug "$dir does not exist"
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.12.0+git3.5c81805c/heartbeat/nfsserver
new/resource-agents-4.12.0+git10.fe1a2f88/heartbeat/nfsserver
--- old/resource-agents-4.12.0+git3.5c81805c/heartbeat/nfsserver
2023-01-25 12:32:16.000000000 +0100
+++ new/resource-agents-4.12.0+git10.fe1a2f88/heartbeat/nfsserver
2023-03-13 15:12:01.000000000 +0100
@@ -711,7 +711,9 @@
test -d "$dir" || mkdir -p "$dir"
test -e "$dropin" && rm -f "$dropin"
- edited_exec_start=$(systemctl cat $svc | sed -ne
"s#^ExecStart=\\([-+:!@]*\\)\\(.*\\)#ExecStart=\\1/usr/bin/unshare --uts
/bin/sh -c 'hostname \${NFS_SERVER_SCOPE}; exec \"\$@\"' -- \\2#p")
+ # NOTE: additional ExecStart= might exist in the drop-in files,
eg. openSUSE
+ edited_exec_start=$(systemctl cat $svc | sed -ne
"s#^ExecStart=\\([-+:!@]*\\)\\(.\+\\)#ExecStart=\\1/usr/bin/unshare --uts
/bin/sh -c 'hostname \${NFS_SERVER_SCOPE}; exec \"\$@\"' -- \\2#p" | tail -1)
+
cat > "$dropin" <<___
[Service]
EnvironmentFile=$SYSTEMD_ENVIRONMENT_FILE_NFS_SERVER_SCOPE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.12.0+git3.5c81805c/heartbeat/ocf-shellfuncs.in
new/resource-agents-4.12.0+git10.fe1a2f88/heartbeat/ocf-shellfuncs.in
--- old/resource-agents-4.12.0+git3.5c81805c/heartbeat/ocf-shellfuncs.in
2023-01-25 12:32:16.000000000 +0100
+++ new/resource-agents-4.12.0+git10.fe1a2f88/heartbeat/ocf-shellfuncs.in
2023-03-13 15:12:01.000000000 +0100
@@ -1052,7 +1052,7 @@
ocf_version_cmp "$OCF_RESKEY_crm_feature_set" "3.10.0"
res=$?
if [ $res -eq 2 ] || [ $res -eq 1 ] || ! have_binary "crm_master"; then
- ${HA_SBIN_DIR}/crm_attribute -p $@
+ ${HA_SBIN_DIR}/crm_attribute -p ${OCF_RESOURCE_INSTANCE} $@
else
${HA_SBIN_DIR}/crm_master -l reboot $@
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.12.0+git3.5c81805c/heartbeat/pgsql
new/resource-agents-4.12.0+git10.fe1a2f88/heartbeat/pgsql
--- old/resource-agents-4.12.0+git3.5c81805c/heartbeat/pgsql 2023-01-25
12:32:16.000000000 +0100
+++ new/resource-agents-4.12.0+git10.fe1a2f88/heartbeat/pgsql 2023-03-13
15:12:01.000000000 +0100
@@ -1835,7 +1835,7 @@
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
else
ocf_exit_reason "Configuration file $1 doesn't exist"
@@ -1846,8 +1846,7 @@
return $rc
}
-# Validate most critical parameters
-pgsql_validate_all() {
+validate_ocf_check_level_10() {
local version
local check_config_rc
local rep_mode_string
@@ -1883,12 +1882,6 @@
fi
fi
- getent passwd $OCF_RESKEY_pgdba >/dev/null 2>&1
- if [ ! $? -eq 0 ]; then
- ocf_exit_reason "User $OCF_RESKEY_pgdba doesn't exist";
- return $OCF_ERR_INSTALLED;
- fi
-
if ocf_is_probe; then
ocf_log info "Don't check $OCF_RESKEY_pgdata during probe"
else
@@ -1898,18 +1891,6 @@
fi
fi
- if [ -n "$OCF_RESKEY_monitor_user" -a ! -n "$OCF_RESKEY_monitor_password" ]
- then
- ocf_exit_reason "monitor password can't be empty"
- return $OCF_ERR_CONFIGURED
- fi
-
- if [ ! -n "$OCF_RESKEY_monitor_user" -a -n "$OCF_RESKEY_monitor_password" ]
- then
- ocf_exit_reason "monitor_user has to be set if monitor_password is set"
- return $OCF_ERR_CONFIGURED
- fi
-
if is_replication || [ "$OCF_RESKEY_rep_mode" = "slave" ]; then
if [ `printf "$version\n9.1" | sort -n | head -1` != "9.1" ]; then
ocf_exit_reason "Replication mode needs PostgreSQL 9.1 or higher."
@@ -2027,6 +2008,35 @@
return $OCF_SUCCESS
}
+# Validate most critical parameters
+pgsql_validate_all() {
+ local rc
+
+ getent passwd $OCF_RESKEY_pgdba >/dev/null 2>&1
+ if [ ! $? -eq 0 ]; then
+ ocf_exit_reason "User $OCF_RESKEY_pgdba doesn't exist";
+ return $OCF_ERR_INSTALLED;
+ fi
+
+ if [ -n "$OCF_RESKEY_monitor_user" ] && [ -z
"$OCF_RESKEY_monitor_password" ]; then
+ ocf_exit_reason "monitor password can't be empty"
+ return $OCF_ERR_CONFIGURED
+ fi
+
+ if [ -z "$OCF_RESKEY_monitor_user" ] && [ -n
"$OCF_RESKEY_monitor_password" ]; then
+ ocf_exit_reason "monitor_user has to be set if monitor_password is set"
+ return $OCF_ERR_CONFIGURED
+ fi
+
+ if [ "$OCF_CHECK_LEVEL" -eq 10 ]; then
+ validate_ocf_check_level_10
+ rc=$?
+ [ $rc -ne "$OCF_SUCCESS" ] && exit $rc
+ fi
+
+ return $OCF_SUCCESS
+}
+
#
# Check if we need to create a log file
@@ -2163,6 +2173,7 @@
exit $OCF_SUCCESS;;
esac
+[ "$__OCF_ACTION" != "validate-all" ] && OCF_CHECK_LEVEL=10
pgsql_validate_all
rc=$?
