Hello community,
here is the log from the commit of package resource-agents for openSUSE:Factory
checked in at 2019-05-09 10:02:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/resource-agents (Old)
and /work/SRC/openSUSE:Factory/.resource-agents.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents"
Thu May 9 10:02:15 2019 rev:93 rq:700375 version:4.2.0+git104.25f2052b
Changes:
--------
--- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes
2019-04-04 14:11:42.841277990 +0200
+++
/work/SRC/openSUSE:Factory/.resource-agents.new.5148/resource-agents.changes
2019-05-09 10:02:18.467807926 +0200
@@ -1,0 +2,30 @@
+Fri May 03 11:34:56 UTC 2019 - [email protected]
+
+- Update to version 4.2.0+git104.25f2052b:
+ * Low: LVM: Change of return code when start fails.
+ * galera: Ignore safe_to_bootstrap in grastate.dat in some cases
+ * aws-vpc-move-ip: Linting adjustment (bsc#1133962)
+ * aws-vpc-move-ip: Moving shared part outside if (bsc#1133962)
+ * aws-vpc-move-ip: More robust approach of getting MAC address (bsc#1133962)
+ * ethmonitor: fix is_interface() regression
+ * aws-vpc-move-ip: Requested fix to avoid using AWS API (bsc#1133962)
+ * aws-vpc-move-ip: Fixing indentation (bsc#1133962)
+ * aws-vpc-move-ip: Fix for VM having multiple network interfaces
(bsc#1133962)
+ * add network namespace support to IPaddr2
+ * [rabbitmq] Stop redirecting all output to /dev/null in set_policy
+ * Support build and install on RHEL 6 (#1308)
+ * gcp-vpc-move-route/gcp-vpc-move-vip: fix Python 3 encoding issue
+ * IPsrcaddr: make proto optional to fix regression when used without
NetworkManager
+ * LVM-activate: align dmsetup report command to standard
+ * LVM-activate: return OCF_NOT_RUNNING on initial probe (bsc#1114855)
+ * ethmonitor: check if interface exists by link
+ * Squid: fix pid file issue due to new Squid version saving the PID of the
parent process instead of the listener child process
+ * Restrict strncpy by size of target, not of source. Fixes gcc error/warning
+ * CTDB: add ctdb_max_open_files parameter
+ * LVM-activate: only check locking_type when LVM < v2.03
+ * redis: Filter warning from stderr when calling 'redis-cli -a'
+ * LVM-activate: fix indentation
+
+- Remove 0007-LVM-activate-return-OCF_NOT_RUNNING-on-initial-probe.patch
+
+-------------------------------------------------------------------
Old:
----
0007-LVM-activate-return-OCF_NOT_RUNNING-on-initial-probe.patch
resource-agents-4.2.0+git63.0f7987fb.tar.xz
New:
----
resource-agents-4.2.0+git104.25f2052b.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ resource-agents.spec ++++++
--- /var/tmp/diff_new_pack.v2skgc/_old 2019-05-09 10:02:20.623814099 +0200
+++ /var/tmp/diff_new_pack.v2skgc/_new 2019-05-09 10:02:20.659814202 +0200
@@ -17,7 +17,7 @@
Name: resource-agents
-Version: 4.2.0+git63.0f7987fb
+Version: 4.2.0+git104.25f2052b
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
@@ -37,8 +37,6 @@
Patch4: 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
# PATCH-FIX-OPENSUSE: Revert ocf_log: use same log format at pacemaker
Patch6: 0006-Revert-ocf_log-use-same-log-format-as-pacemaker.patch
-# bsc#1114855
-Patch7: 0007-LVM-activate-return-OCF_NOT_RUNNING-on-initial-probe.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -112,7 +110,6 @@
%patch3 -p1
%patch4 -p1
%patch6 -p1
-%patch7 -p1
%build
autoreconf -fvi
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.v2skgc/_old 2019-05-09 10:02:21.335816138 +0200
+++ /var/tmp/diff_new_pack.v2skgc/_new 2019-05-09 10:02:21.355816195 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/resource-agents.git</param>
-<param name="changesrevision">0f7987fb8a25b23d8d8eda2d5a040bd8aa09bca3</param>
+<param name="changesrevision">25f2052bc077e49369950a35e009ee11f0bf50e6</param>
</service>
</servicedata>
\ No newline at end of file
++++++ resource-agents-4.2.0+git63.0f7987fb.tar.xz ->
resource-agents-4.2.0+git104.25f2052b.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.2.0+git63.0f7987fb/Makefile.am
new/resource-agents-4.2.0+git104.25f2052b/Makefile.am
--- old/resource-agents-4.2.0+git63.0f7987fb/Makefile.am 2019-02-08
10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/Makefile.am 2019-04-27
09:36:05.000000000 +0200
@@ -22,6 +22,8 @@
DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar \
compile config.guess config.sub depcomp
+ACLOCAL_AMFLAGS = -I m4
+
SPEC = $(PACKAGE_NAME).spec
TARFILES = $(PACKAGE_NAME)-$(VERSION).tar.bz2 \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.2.0+git63.0f7987fb/configure.ac
new/resource-agents-4.2.0+git104.25f2052b/configure.ac
--- old/resource-agents-4.2.0+git63.0f7987fb/configure.ac 2019-02-08
10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/configure.ac 2019-04-27
09:36:05.000000000 +0200
@@ -514,15 +514,17 @@
AC_PYTHON_MODULE(googleapiclient)
AC_PYTHON_MODULE(pyroute2)
+AS_VERSION_COMPARE([$PYTHON_VERSION], [2.7], [BUILD_OCF_PY=0],
[BUILD_OCF_PY=1], [BUILD_OCF_PY=1])
+
BUILD_AZURE_EVENTS=1
-if test -z "$PYTHON"; then
+if test -z "$PYTHON" || test $BUILD_OCF_PY -eq 0; then
BUILD_AZURE_EVENTS=0
AC_MSG_WARN("Not building azure-events")
fi
AM_CONDITIONAL(BUILD_AZURE_EVENTS, test $BUILD_AZURE_EVENTS -eq 1)
BUILD_GCP_PD_MOVE=1
-if test -z "$PYTHON" || test "x${HAVE_PYMOD_GOOGLEAPICLIENT}" != xyes; then
+if test -z "$PYTHON" || test "x${HAVE_PYMOD_GOOGLEAPICLIENT}" != xyes || test
$BUILD_OCF_PY -eq 0; then
BUILD_GCP_PD_MOVE=0
AC_MSG_WARN("Not building gcp-pd-move")
fi
@@ -530,14 +532,14 @@
BUILD_GCP_VPC_MOVE_ROUTE=1
if test -z "$PYTHON" || test "x${HAVE_PYMOD_GOOGLEAPICLIENT}" != xyes || \
- test "x${HAVE_PYMOD_PYROUTE2}" != xyes; then
+ test "x${HAVE_PYMOD_PYROUTE2}" != xyes || test $BUILD_OCF_PY -eq 0; then
BUILD_GCP_VPC_MOVE_ROUTE=0
AC_MSG_WARN("Not building gcp-vpc-move-route")
fi
AM_CONDITIONAL(BUILD_GCP_VPC_MOVE_ROUTE, test $BUILD_GCP_VPC_MOVE_ROUTE -eq 1)
BUILD_GCP_VPC_MOVE_VIP=1
-if test -z "$PYTHON" || test "x${HAVE_PYMOD_GOOGLEAPICLIENT}" != xyes; then
+if test -z "$PYTHON" || test "x${HAVE_PYMOD_GOOGLEAPICLIENT}" != xyes || test
$BUILD_OCF_PY -eq 0; then
BUILD_GCP_VPC_MOVE_VIP=0
AC_MSG_WARN("Not building gcp-vpc-move-vip")
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/CTDB.in
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/CTDB.in
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/CTDB.in 2019-02-08
10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/CTDB.in 2019-04-27
09:36:05.000000000 +0200
@@ -288,6 +288,14 @@
<content type="integer" default="2" />
</parameter>
+<parameter name="ctdb_max_open_files" required="0">
+<longdesc lang="en">
+Maximum number of open files (for ulimit -n)
+</longdesc>
+<shortdesc lang="en">Max open files</shortdesc>
+<content type="integer" default="" />
+</parameter>
+
<parameter name="smb_conf" unique="0" required="0">
<longdesc lang="en">
Path to default samba config file. Only necessary if CTDB
@@ -611,6 +619,11 @@
start_as_disabled="--start-as-disabled"
ocf_is_true "$OCF_RESKEY_ctdb_start_as_disabled" || start_as_disabled=""
+ # set nofile ulimit for ctdbd process
+ if [ -n "$OCF_RESKEY_ctdb_max_open_files" ]; then
+ ulimit -n "$OCF_RESKEY_ctdb_max_open_files"
+ fi
+
# Start her up
"$OCF_RESKEY_ctdbd_binary" \
--reclock="$OCF_RESKEY_ctdb_recovery_lock" \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/IPaddr2
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/IPaddr2
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/IPaddr2 2019-02-08
10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/IPaddr2 2019-04-27
09:36:05.000000000 +0200
@@ -368,6 +368,16 @@
<content type="string" default="${OCF_RESKEY_preferred_lft_default}"/>
</parameter>
+<parameter name="network_namespace">
+<longdesc lang="en">
+Specifies the network namespace to operate within.
+The namespace must already exist, and the interface to be used must be within
+the namespace.
+</longdesc>
+<shortdesc lang="en">Network namespace to use</shortdesc>
+<content type="string" default=""/>
+</parameter>
+
</parameters>
<actions>
<action name="start" timeout="20s" />
@@ -1126,6 +1136,10 @@
check_binary $IP2UTIL
IP_CIP=
+ if [ -n "$OCF_RESKEY_network_namespace" ]; then
+ OCF_RESKEY_network_namespace= exec $IP2UTIL netns exec
"$OCF_RESKEY_network_namespace" "$0" "$__OCF_ACTION"
+ fi
+
ip_init
set_send_arp_program
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/IPsrcaddr
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/IPsrcaddr
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/IPsrcaddr
2019-02-08 10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/IPsrcaddr
2019-04-27 09:36:05.000000000 +0200
@@ -50,12 +50,17 @@
#######################################################################
# Initialization:
-
: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
+# Defaults
+OCF_RESKEY_proto_default=""
+
+: ${OCF_RESKEY_proto=${OCF_RESKEY_proto_default}}
#######################################################################
+[ -z "$OCF_RESKEY_proto" ] && PROTO="" || PROTO="proto $OCF_RESKEY_proto"
+
USAGE="usage: $0 {start|stop|status|monitor|validate-all|meta-data}";
CMDSHOW="$IP2UTIL route show to exact 0.0.0.0/0"
@@ -97,6 +102,14 @@
<shortdesc lang="en">Netmask</shortdesc>
<content type="string" default=""/>
</parameter>
+
+<parameter name="proto">
+<longdesc lang="en">
+Proto to match when finding network. E.g. "kernel".
+</longdesc>
+<shortdesc lang="en">Proto</shortdesc>
+<content type="string" default="" />
+</parameter>
</parameters>
<actions>
@@ -172,7 +185,7 @@
rc=$OCF_SUCCESS
ocf_log info "The ip route has been already set.($NETWORK,
$INTERFACE, $ROUTE_WO_SRC)"
else
- ip route replace $NETWORK dev $INTERFACE src $1 || \
+ $IP2UTIL route replace $NETWORK dev $INTERFACE src $1 || \
errorexit "command 'ip route replace $NETWORK dev
$INTERFACE src $1' failed"
$CMDCHANGE $ROUTE_WO_SRC src $1 || \
@@ -204,7 +217,7 @@
[ $rc = 2 ] && errorexit "The address you specified to stop does not
match the preferred source address"
- ip route replace $NETWORK dev $INTERFACE || \
+ $IP2UTIL route replace $NETWORK dev $INTERFACE || \
errorexit "command 'ip route replace $NETWORK dev $INTERFACE'
failed"
$CMDCHANGE $ROUTE_WO_SRC || \
@@ -473,7 +486,7 @@
}
INTERFACE=`echo $findif_out | awk '{print $1}'`
-NETWORK=`ip route list dev $INTERFACE scope link proto kernel match
$ipaddress|grep -o '^[^ ]*'`
+NETWORK=`$IP2UTIL route list dev $INTERFACE scope link $PROTO match
$ipaddress|grep -m 1 -o '^[^ ]*'`
case $1 in
start) srca_start $ipaddress
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/LVM
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/LVM
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/LVM 2019-02-08
10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/LVM 2019-04-27
09:36:05.000000000 +0200
@@ -238,7 +238,7 @@
return $OCF_SUCCESS
else
ocf_exit_reason "LVM: $vg did not activate correctly"
- return $OCF_NOT_RUNNING
+ return $OCF_ERR_GENERIC
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/LVM-activate
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/LVM-activate
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/LVM-activate
2019-02-08 10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/LVM-activate
2019-04-27 09:36:05.000000000 +0200
@@ -230,63 +230,63 @@
{
local owner=$(vgs -o tags --noheadings ${VG} | tr -d '[:blank:]')
- if [ -z "$owner" ]; then
- # No-one owns this VG yet
- return 1
- fi
-
- if [ "$OUR_TAG" = "$owner" ]; then
- # yep, this is ours
- return 0
- fi
+ if [ -z "$owner" ]; then
+ # No-one owns this VG yet
+ return 1
+ fi
+
+ if [ "$OUR_TAG" = "$owner" ]; then
+ # yep, this is ours
+ return 0
+ fi
- # some other tag is set on this vg
- return 2
+ # some other tag is set on this vg
+ return 2
}
strip_tags()
{
- local tag
+ local tag
for tag in $(vgs --noheadings -o tags $OCF_RESKEY_volgrpname | sed
s/","/" "/g); do
- ocf_log info "Stripping tag, $tag"
+ ocf_log info "Stripping tag, $tag"
- # LVM version 2.02.98 allows changing tags if PARTIAL
- vgchange --deltag "$tag" ${VG}
- done
+ # LVM version 2.02.98 allows changing tags if PARTIAL
+ vgchange --deltag "$tag" ${VG}
+ done
if [ ! -z $(vgs -o tags --noheadings ${VG} | tr -d '[:blank:]') ]; then
- ocf_exit_reason "Failed to remove ownership tags from ${VG}"
- exit $OCF_ERR_GENERIC
- fi
+ ocf_exit_reason "Failed to remove ownership tags from ${VG}"
+ exit $OCF_ERR_GENERIC
+ fi
- return $OCF_SUCCESS
+ return $OCF_SUCCESS
}
set_tags()
{
- case check_tags in
- 0)
- # we already own it.
- return $OCF_SUCCESS
- ;;
- 2)
- # other tags are set, strip them before setting
- if ! strip_tags; then
- return $OCF_ERR_GENERIC
- fi
- ;;
- *)
- : ;;
- esac
-
- if ! vgchange --addtag $OUR_TAG ${VG} ; then
- ocf_log err "Failed to add ownership tag to ${VG}"
- return $OCF_ERR_GENERIC
- fi
+ case check_tags in
+ 0)
+ # we already own it.
+ return $OCF_SUCCESS
+ ;;
+ 2)
+ # other tags are set, strip them before setting
+ if ! strip_tags; then
+ return $OCF_ERR_GENERIC
+ fi
+ ;;
+ *)
+ : ;;
+ esac
- ocf_log info "New tag \"${OUR_TAG}\" added to ${VG}"
- return $OCF_SUCCESS
+ if ! vgchange --addtag $OUR_TAG ${VG} ; then
+ ocf_log err "Failed to add ownership tag to ${VG}"
+ return $OCF_ERR_GENERIC
+ fi
+
+ ocf_log info "New tag \"${OUR_TAG}\" added to ${VG}"
+ return $OCF_SUCCESS
}
# Parameters:
@@ -311,7 +311,12 @@
lvmlockd_check()
{
config_verify "global/use_lvmlockd" "1"
- config_verify "global/locking_type" "1"
+
+ # locking_type was removed from config in v2.03
+ ocf_version_cmp "$(lvmconfig --version | awk '/LVM ver/ {sub(/\(.*/,
"", $3); print $3}')" "2.03"
+ if [ "$?" -eq 0 ]; then
+ config_verify "global/locking_type" "1"
+ fi
# We recommend to activate one LV at a time so that this specific volume
# binds to a proper filesystem to protect the data
@@ -324,6 +329,7 @@
# Good: lvmlockd is running, and clvmd is not running
if ! pgrep lvmlockd >/dev/null 2>&1 ; then
if ocf_is_probe; then
+ ocf_log info "initial probe: lvmlockd is not running
yet."
exit $OCF_NOT_RUNNING
fi
@@ -402,24 +408,24 @@
# Verify tags setup
tagging_check()
{
- # The volume_list must be initialized to something in order to
- # guarantee our tag will be filtered on startup
- if ! lvm dumpconfig activation/volume_list; then
- ocf_log err "LVM: Improper setup detected"
- ocf_exit_reason "The volume_list filter must be initialized in
lvm.conf for exclusive activation without clvmd"
- exit $OCF_ERR_CONFIGURED
- fi
-
- # Our tag must _NOT_ be in the volume_list. This agent
- # overrides the volume_list during activation using the
- # special tag reserved for cluster activation
- if lvm dumpconfig activation/volume_list | grep -e "\"@${OUR_TAG}\""
-e "\"${VG}\""; then
- ocf_log err "LVM: Improper setup detected"
- ocf_exit_reason "The volume_list in lvm.conf must not contain
the cluster tag, \"${OUR_TAG}\", or volume group, ${VG}"
+ # The volume_list must be initialized to something in order to
+ # guarantee our tag will be filtered on startup
+ if ! lvm dumpconfig activation/volume_list; then
+ ocf_log err "LVM: Improper setup detected"
+ ocf_exit_reason "The volume_list filter must be initialized in
lvm.conf for exclusive activation without clvmd"
exit $OCF_ERR_CONFIGURED
- fi
+ fi
- return $OCF_SUCCESS
+ # Our tag must _NOT_ be in the volume_list. This agent
+ # overrides the volume_list during activation using the
+ # special tag reserved for cluster activation
+ if lvm dumpconfig activation/volume_list | grep -e "\"@${OUR_TAG}\"" -e
"\"${VG}\""; then
+ ocf_log err "LVM: Improper setup detected"
+ ocf_exit_reason "The volume_list in lvm.conf must not contain
the cluster tag, \"${OUR_TAG}\", or volume group, ${VG}"
+ exit $OCF_ERR_CONFIGURED
+ fi
+
+ return $OCF_SUCCESS
}
read_parameters()
@@ -476,6 +482,11 @@
exit $OCF_SUCCESS
fi
+ if ocf_is_probe; then
+ ocf_log info "initial probe: VG [${VG}] is not found on
any block device yet."
+ exit $OCF_NOT_RUNNING
+ fi
+
ocf_exit_reason "Volume group[${VG}] doesn't exist, or not
visible on this node!"
exit $OCF_ERR_CONFIGURED
fi
@@ -696,7 +707,7 @@
# method:
#
# lv_count=$(vgs --foreign -o lv_count --noheadings ${VG} 2>/dev/null | tr -d
'[:blank:]')
-# dm_count=$(dmsetup --noheadings info -c -S "vgname=${VG}" 2>/dev/null | grep
-c "${VG}-")
+# dm_count=$(dmsetup --noheadings info -c -S "vg_name=${VG}" 2>/dev/null |
grep -c "${VG}-")
# test $lv_count -eq $dm_count
#
# It works, but we cannot afford to use LVM command in lvm_status. LVM command
is expensive
@@ -719,9 +730,9 @@
if [ -n "${LV}" ]; then
# dmsetup ls? It cannot accept device name. It's
# too heavy to list all DM devices.
- dm_count=$(dmsetup info --noheadings --noflush -c -S
"vgname=${VG} && lvname=${LV}" | grep -c -v '^No devices found')
+ dm_count=$(dmsetup info --noheadings --noflush -c -S
"vg_name=${VG} && lv_name=${LV}" | grep -c -v '^No devices found')
else
- dm_count=$(dmsetup info --noheadings --noflush -c -S
"vgname=${VG}" | grep -c -v '^No devices found')
+ dm_count=$(dmsetup info --noheadings --noflush -c -S
"vg_name=${VG}" | grep -c -v '^No devices found')
fi
if [ $dm_count -eq 0 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/Squid.in
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/Squid.in
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/Squid.in 2019-02-08
10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/Squid.in
2019-04-27 09:36:05.000000000 +0200
@@ -96,12 +96,9 @@
<content type="string" default=""/>
</parameter>
-<parameter name="squid_pidfile" required="1" unique="1">
-<longdesc lang="en">
-This is a required parameter. This parameter specifies a process id file
-for a squid instance managed by this RA.
-</longdesc>
-<shortdesc lang="en">Pidfile</shortdesc>
+<parameter name="squid_pidfile" required="0" unique="1">
+<longdesc lang="en">Deprecated - do not use anymore</longdesc>
+<shortdesc lang="en">deprecated - do not use anymore</shortdesc>
<content type="string" default=""/>
</parameter>
@@ -175,8 +172,8 @@
# Seek by pattern
SQUID_PIDS[0]=$(pgrep -f "$PROCESS_PATTERN")
- # Seek by pidfile
- SQUID_PIDS[1]=$(awk '1{print $1}' $SQUID_PIDFILE 2>/dev/null)
+ # Seek by child process
+ SQUID_PIDS[1]=$(pgrep -P ${SQUID_PIDS[0]})
if [[ -n "${SQUID_PIDS[1]}" ]]; then
typeset exe
@@ -306,7 +303,6 @@
while true; do
get_pids
if is_squid_dead; then
- rm -f $SQUID_PIDFILE
return $OCF_SUCCESS
fi
(( lapse_sec = lapse_sec + 1 ))
@@ -326,7 +322,6 @@
kill -KILL ${SQUID_PIDS[0]} ${SQUID_PIDS[2]}
sleep 1
if is_squid_dead; then
- rm -f $SQUID_PIDFILE
return $OCF_SUCCESS
fi
done
@@ -389,12 +384,6 @@
exit $OCF_ERR_CONFIGURED
fi
-SQUID_PIDFILE="${OCF_RESKEY_squid_pidfile}"
-if [[ -z "$SQUID_PIDFILE" ]]; then
- ocf_exit_reason "SQUID_PIDFILE is not defined"
- exit $OCF_ERR_CONFIGURED
-fi
-
SQUID_PORT="${OCF_RESKEY_squid_port}"
if [[ -z "$SQUID_PORT" ]]; then
ocf_exit_reason "SQUID_PORT is not defined"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/aws-vpc-move-ip
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/aws-vpc-move-ip
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/aws-vpc-move-ip
2019-02-08 10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/aws-vpc-move-ip
2019-04-27 09:36:05.000000000 +0200
@@ -219,8 +219,33 @@
}
ec2ip_get_and_configure() {
+ MAC_FILE="/sys/class/net/${OCF_RESKEY_interface}/address"
+ if [ -f $MAC_FILE ]; then
+ cmd="cat ${MAC_FILE}"
+ else
+ cmd="ip -br link show dev ${OCF_RESKEY_interface} | tr -s ' ' |
cut -d' ' -f3"
+ fi
+ ocf_log debug "executing command: $cmd"
+ MAC_ADDR="$(eval $cmd)"
+ rc=$?
+ if [ $rc != 0 ]; then
+ ocf_log warn "command failed, rc: $rc"
+ return $OCF_ERR_GENERIC
+ fi
+ ocf_log debug "MAC address associated with interface
${OCF_RESKEY_interface}: ${MAC_ADDR}"
+
+ cmd="curl -s
http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC_ADDR}/interface-id";
+ ocf_log debug "executing command: $cmd"
+ EC2_NETWORK_INTERFACE_ID="$(eval $cmd)"
+ rc=$?
+ if [ $rc != 0 ]; then
+ ocf_log warn "command failed, rc: $rc"
+ return $OCF_ERR_GENERIC
+ fi
+ ocf_log debug "network interface id associated MAC address ${MAC_ADDR}:
${EC2_NETWORK_INTERFACE_ID}"
+
for rtb in $(echo $OCF_RESKEY_routing_table | sed -e 's/,/ /g'); do
- cmd="$OCF_RESKEY_awscli --profile $OCF_RESKEY_profile --output
text ec2 replace-route --route-table-id $rtb --destination-cidr-block
${OCF_RESKEY_ip}/32 --instance-id $EC2_INSTANCE_ID"
+ cmd="$OCF_RESKEY_awscli --profile $OCF_RESKEY_profile --output
text ec2 replace-route --route-table-id $rtb --destination-cidr-block
${OCF_RESKEY_ip}/32 --network-interface-id $EC2_NETWORK_INTERFACE_ID"
ocf_log debug "executing command: $cmd"
$cmd
rc=$?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/ethmonitor
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/ethmonitor
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/ethmonitor
2019-02-08 10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/ethmonitor
2019-04-27 09:36:05.000000000 +0200
@@ -206,8 +206,8 @@
#
# List interfaces but exclude FreeS/WAN ipsecN virtual interfaces
#
- local iface=`$IP2UTIL -o -f inet addr show | grep " $1 " \
- | cut -d ' ' -f2 | sort -u | grep -v '^ipsec[0-9][0-9]*$'`
+ local iface=`$IP2UTIL -o -f link addr show | grep " $1:" \
+ | cut -d ' ' -f2 | tr -d ':' | sort -u | grep -v
'^ipsec[0-9][0-9]*$'`
[ "$iface" != "" ]
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/galera
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/galera
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/galera 2019-02-08
10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/galera 2019-04-27
09:36:05.000000000 +0200
@@ -564,10 +564,21 @@
detect_safe_to_bootstrap()
{
local safe_to_bootstrap=""
+ local uuid=""
+ local seqno=""
if [ -f ${OCF_RESKEY_datadir}/grastate.dat ]; then
ocf_log info "attempting to read safe_to_bootstrap flag from
${OCF_RESKEY_datadir}/grastate.dat"
safe_to_bootstrap=$(sed -n 's/^safe_to_bootstrap:\s*\(.*\)$/\1/p' <
${OCF_RESKEY_datadir}/grastate.dat)
+ uuid=$(sed -n 's/^uuid:\s*\(.*\)$/\1/p' <
${OCF_RESKEY_datadir}/grastate.dat)
+ seqno=$(sed -n 's/^seqno:\s*\(.*\)$/\1/p' <
${OCF_RESKEY_datadir}/grastate.dat)
+ fi
+
+ if [ -z "$uuid" ] || [ -z "$seqno" ] || \
+ [ "$uuid" = "00000000-0000-0000-0000-000000000000" ] || \
+ [ "$seqno" = "-1" ]; then
+ clear_safe_to_bootstrap
+ return
fi
if [ "$safe_to_bootstrap" = "1" ] || [ "$safe_to_bootstrap" = "0" ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/gcp-vpc-move-route.in
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/gcp-vpc-move-route.in
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/gcp-vpc-move-route.in
2019-02-08 10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/gcp-vpc-move-route.in
2019-04-27 09:36:05.000000000 +0200
@@ -193,7 +193,7 @@
url = '%s?%s' % (metadata_url, params)
request = urlrequest.Request(url, headers=METADATA_HEADERS)
request_opener = urlrequest.build_opener(urlrequest.ProxyHandler({}))
- return request_opener.open(request, timeout=timeout * 1.1).read()
+ return request_opener.open(request, timeout=timeout *
1.1).read().decode("utf-8")
def validate(ctx):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/gcp-vpc-move-vip.in
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/gcp-vpc-move-vip.in
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/gcp-vpc-move-vip.in
2019-02-08 10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/gcp-vpc-move-vip.in
2019-04-27 09:36:05.000000000 +0200
@@ -106,7 +106,7 @@
url = '%s?%s' % (metadata_url, params)
request = urlrequest.Request(url, headers=METADATA_HEADERS)
request_opener = urlrequest.build_opener(urlrequest.ProxyHandler({}))
- return request_opener.open(request, timeout=timeout * 1.1).read()
+ return request_opener.open(request, timeout=timeout *
1.1).read().decode("utf-8")
def get_instance(project, zone, instance):
@@ -162,7 +162,7 @@
def get_localhost_alias():
net_iface = get_metadata('instance/network-interfaces', {'recursive': True})
- net_iface = json.loads(net_iface.decode('utf-8'))
+ net_iface = json.loads(net_iface)
try:
return net_iface[0]['ipAliases'][0]
except (KeyError, IndexError):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/rabbitmq-cluster
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/rabbitmq-cluster
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/rabbitmq-cluster
2019-02-08 10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/rabbitmq-cluster
2019-04-27 09:36:05.000000000 +0200
@@ -276,7 +276,7 @@
if [ -n "$OCF_RESKEY_set_policy" ]; then
# do not quote set_policy, we are passing in arguments
- rmq_set_policy $OCF_RESKEY_set_policy > /dev/null 2>&1
+ rmq_set_policy $OCF_RESKEY_set_policy
if [ $? -ne 0 ]; then
ocf_log err "Failed to set policy:
$OCF_RESKEY_set_policy"
rc=$OCF_ERR_GENERIC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/redis.in
new/resource-agents-4.2.0+git104.25f2052b/heartbeat/redis.in
--- old/resource-agents-4.2.0+git63.0f7987fb/heartbeat/redis.in 2019-02-08
10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/heartbeat/redis.in
2019-04-27 09:36:05.000000000 +0200
@@ -302,7 +302,9 @@
redis_client() {
ocf_log debug "redis_client: '$REDIS_CLIENT' -s '$REDIS_SOCKET' $*"
if [ -n "$clientpasswd" ]; then
- "$REDIS_CLIENT" -s "$REDIS_SOCKET" -a "$clientpasswd" "$@" |
sed 's/\r//'
+ # Starting with 4.0.10 there is a warning on stderr when using
a pass
+ # Once we stop supporting versions < 5.0.0 we can add
--no-auth-warning here
+ ("$REDIS_CLIENT" -s "$REDIS_SOCKET" -a "$clientpasswd" "$@"
2>&1 >&3 3>&- | grep -v "Using a password" >&2 3>&-) 3>&1 | sed 's/\r//'
else
"$REDIS_CLIENT" -s "$REDIS_SOCKET" "$@" | sed 's/\r//'
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/resource-agents.spec.in
new/resource-agents-4.2.0+git104.25f2052b/resource-agents.spec.in
--- old/resource-agents-4.2.0+git63.0f7987fb/resource-agents.spec.in
2019-02-08 10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/resource-agents.spec.in
2019-04-27 09:36:05.000000000 +0200
@@ -100,12 +100,14 @@
Requires: /usr/bin/gawk
Requires: /usr/bin/ps
Requires: /usr/sbin/fuser /usr/bin/mount
+Requires: hostname
%else
Requires: /bin/gawk
Requires: /bin/ps
Requires: /sbin/fuser /bin/mount
+Requires: /bin/hostname
%endif
-Requires: bash grep hostname sed
+Requires: bash grep sed
Requires: /usr/bin/pkill /bin/netstat
# Filesystem / fs.sh / netfs.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git63.0f7987fb/tools/sfex_lib.c
new/resource-agents-4.2.0+git104.25f2052b/tools/sfex_lib.c
--- old/resource-agents-4.2.0+git63.0f7987fb/tools/sfex_lib.c 2019-02-08
10:56:46.000000000 +0100
+++ new/resource-agents-4.2.0+git104.25f2052b/tools/sfex_lib.c 2019-04-27
09:36:05.000000000 +0200
@@ -426,7 +426,7 @@
return -1;
}
ldata->count = atoi ((char *) (block->count));
- strncpy ((char *) (ldata->nodename), (const char *) (block->nodename),
sizeof(block->nodename) - 0);
+ strncpy ((char *) (ldata->nodename), (const char *) (block->nodename),
sizeof(ldata->nodename));
#ifdef SFEX_DEBUG
cl_log(LOG_INFO, "status: %c\n", ldata->status);
