Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2013-03-28 13:26:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/resource-agents (Old) and /work/SRC/openSUSE:Factory/.resource-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes 2013-02-07 10:48:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes 2013-03-28 13:26:18.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Mar 26 15:43:56 UTC 2013 - [email protected] + +- ocf-shellfuncs: use $HA_VARLIB as default destination for trace + files +- VirtualDomain: allow for custom migrateport +- IPaddr2: support nic:iflabel format in nic parameter +- upstream cs: ddad46 (v3.9.5) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents-3.9.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents/ChangeLog new/resource-agents/ChangeLog --- old/resource-agents/ChangeLog 2013-02-04 08:17:10.000000000 +0100 +++ new/resource-agents/ChangeLog 2013-02-07 13:17:42.000000000 +0100 @@ -1,4 +1,8 @@ -* Wed Jan 30 2012 Linux-HA contributors +* Thu Feb 7 2013 Linux-HA contributors +- stable release 3.9.5 +- IPaddr2: support nic:iflabel format in nic parameter +- VirtualDomain: allow for custom migrateport +* Wed Jan 30 2013 Linux-HA contributors - release candidate 3.9.5 rc1 - ocf-shellfuncs: RA tracing - IPaddr2: make sure that some ARP send program runs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents/configure.ac new/resource-agents/configure.ac --- old/resource-agents/configure.ac 2013-02-04 08:17:10.000000000 +0100 +++ new/resource-agents/configure.ac 2013-02-07 13:17:42.000000000 +0100 @@ -873,7 +873,7 @@ AC_MSG_RESULT([]) AC_MSG_RESULT([$PACKAGE configuration:]) AC_MSG_RESULT([ Version = ${VERSION}]) -AC_MSG_RESULT([ Build Version = df3a7397c506fe16418bc03fec0ab442d47e9557]) +AC_MSG_RESULT([ Build Version = ddad46cb985d6314fe45ab58594e561f02c14dc1]) AC_MSG_RESULT([ Features =${PKG_FEATURES}]) AC_MSG_RESULT([]) AC_MSG_RESULT([ Prefix = ${prefix}]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents/heartbeat/README new/resource-agents/heartbeat/README --- old/resource-agents/heartbeat/README 2013-02-04 08:17:10.000000000 +0100 +++ new/resource-agents/heartbeat/README 2013-02-07 13:17:42.000000000 +0100 @@ -20,3 +20,25 @@ Of course, if the RA is implemented in another programming language, use the appropriate extension. + +RA tracing + +RA tracing may be turned on by setting OCF_TRACE_RA. The trace +output will be saved to OCF_TRACE_FILE, if set, or by default to + + $HA_VARLIB/trace_ra/<type>/<id>.<action>.<timestamp> + +e.g. $HA_VARLIB/trace_ra/oracle/db.start.2012-11-27.08:37:08 + +HA_VARLIB is typically set to /var/lib/heartbeat. + +OCF_TRACE_FILE can be set to a path or file descriptor: + +- FD (small integer [3-9]) in that case it is up to the callers + to capture output; the FD _must_ be open for writing + +- absolute path + +NB: FD 9 may be used for tracing with bash >= v4 in case +OCF_TRACE_FILE is set to a path. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents/heartbeat/VirtualDomain new/resource-agents/heartbeat/VirtualDomain --- old/resource-agents/heartbeat/VirtualDomain 2013-02-04 08:17:10.000000000 +0100 +++ new/resource-agents/heartbeat/VirtualDomain 2013-02-07 13:17:42.000000000 +0100 @@ -21,11 +21,13 @@ OCF_RESKEY_hypervisor_default="$(virsh --quiet uri)" OCF_RESKEY_autoset_utilization_cpu_default="true" OCF_RESKEY_autoset_utilization_hv_memory_default="true" +OCF_RESKEY_migrateport_default=$(( 49152 + $(ocf_maybe_random) % 64 )) : ${OCF_RESKEY_force_stop=${OCF_RESKEY_force_stop_default}} : ${OCF_RESKEY_hypervisor=${OCF_RESKEY_hypervisor_default}} : ${OCF_RESKEY_autoset_utilization_cpu=${OCF_RESKEY_autoset_utilization_cpu_default}} : ${OCF_RESKEY_autoset_utilization_hv_memory=${OCF_RESKEY_autoset_utilization_hv_memory_default}} +: ${OCF_RESKEY_migrateport=${OCF_RESKEY_migrateport_default}} ####################################################################### ## I'd very much suggest to make this RA use bash, @@ -139,6 +141,14 @@ <content type="boolean" default="true" /> </parameter> +<parameter name="migrateport" unique="0" required="0"> +<longdesc lang="en"> +This port will be used in the qemu migrateuri. If unset, the port will be a random highport. +</longdesc> +<shortdesc lang="en">Port for migrateuri</shortdesc> +<content type="integer" /> +</parameter> + </parameters> <actions> @@ -388,8 +398,7 @@ # For quiet ancient libvirt versions a migration port is needed # and the URI must not contain the "//". Newer versions can handle # the "bad" URI. - migrateport=$(( 49152 + $(ocf_maybe_random) % 64 )) - migrateuri="tcp:${migrate_target}:${migrateport}" + migrateuri="tcp:${migrate_target}:${OCF_RESKEY_migrateport}" ;; xen) migrateuri="xenmigr://${migrate_target}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents/heartbeat/ocf-shellfuncs.in new/resource-agents/heartbeat/ocf-shellfuncs.in --- old/resource-agents/heartbeat/ocf-shellfuncs.in 2013-02-04 08:17:10.000000000 +0100 +++ new/resource-agents/heartbeat/ocf-shellfuncs.in 2013-02-07 13:17:42.000000000 +0100 @@ -22,7 +22,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Build version: df3a7397c506fe16418bc03fec0ab442d47e9557 +# Build version: ddad46cb985d6314fe45ab58594e561f02c14dc1 # TODO: Some of this should probably split out into a generic OCF # library for shell scripts, but for the time being, we'll just use it @@ -679,15 +679,16 @@ # RA tracing may be turned on by setting OCF_TRACE_RA # the trace output will be saved to OCF_TRACE_FILE, if set, or # by default to -# $HA_VARRUN/ra_trace/<type>/<id>.<action>.<timestamp> -# e.g. $HA_VARRUN/ra_trace/oracle/db.start.2012-11-27.08:37:08 +# $HA_VARLIB/trace_ra/<type>/<id>.<action>.<timestamp> +# e.g. $HA_VARLIB/trace_ra/oracle/db.start.2012-11-27.08:37:08 # # OCF_TRACE_FILE: # - FD (small integer [3-9]) in that case it is up to the callers # to capture output; the FD _must_ be open for writing # - absolute path # -# NB: FD 9 may be used for tracing with bash >= v4 +# NB: FD 9 may be used for tracing with bash >= v4 in case +# OCF_TRACE_FILE is set to a path. # ocf_is_bash4() { echo "$SHELL" | grep bash > /dev/null && @@ -725,7 +726,7 @@ if [ -n "$OCF_RESOURCE_TYPE" -a \ -n "$OCF_RESOURCE_INSTANCE" -a -n "$__OCF_ACTION" ]; then local ts=`date +%F.%T` - __OCF_TRC_DEST=$HA_VARRUN/trace_ra/${OCF_RESOURCE_TYPE}/${OCF_RESOURCE_INSTANCE}.${__OCF_ACTION}.$ts + __OCF_TRC_DEST=$HA_VARLIB/trace_ra/${OCF_RESOURCE_TYPE}/${OCF_RESOURCE_INSTANCE}.${__OCF_ACTION}.$ts __OCF_TRC_MANAGE="1" fi } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
