Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2015-05-16 20:07:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/resource-agents (Old) and /work/SRC/openSUSE:Factory/.resource-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents" Changes: -------- --- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes 2015-04-30 11:49:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes 2015-05-16 20:07:46.000000000 +0200 @@ -1,0 +2,8 @@ +Fri May 08 17:36:27 UTC 2015 - kgronl...@suse.com + +- Update to version 3.9.6+git.1430920897.b7ea7f9: + + High: galera: make sure to clear last known sequence number promote is even attempted + + High: galera: properly redetect bootstrap after demote + + High: ethmonitor: link_status_only option for skipping RX counter and arping tests + +------------------------------------------------------------------- Old: ---- resource-agents-3.9.6+git.1429568091.f79322c.tar.xz New: ---- resource-agents-3.9.6+git.1430920897.b7ea7f9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ --- /var/tmp/diff_new_pack.gtLxE3/_old 2015-05-16 20:07:47.000000000 +0200 +++ /var/tmp/diff_new_pack.gtLxE3/_new 2015-05-16 20:07:47.000000000 +0200 @@ -48,7 +48,7 @@ Summary: Open Source HA Reusable Cluster Resource Scripts License: GPL-2.0 and LGPL-2.1+ and GPL-3.0+ Group: Productivity/Clustering/HA -Version: 3.9.6+git.1429568091.f79322c +Version: 3.9.6+git.1430920897.b7ea7f9 Release: 0 Url: http://linux-ha.org/ Source: resource-agents-%{version}.tar.xz ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.gtLxE3/_old 2015-05-16 20:07:47.000000000 +0200 +++ /var/tmp/diff_new_pack.gtLxE3/_new 2015-05-16 20:07:47.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/resource-agents.git</param> - <param name="changesrevision">f79322cf2ce0094c266515e9242dbdbde3a7db72</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">b7ea7f9a8c969ec019ccddf12601800483b235eb</param></service></servicedata> \ No newline at end of file ++++++ resource-agents-3.9.6+git.1429568091.f79322c.tar.xz -> resource-agents-3.9.6+git.1430920897.b7ea7f9.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.6+git.1429568091.f79322c/heartbeat/ethmonitor new/resource-agents-3.9.6+git.1430920897.b7ea7f9/heartbeat/ethmonitor --- old/resource-agents-3.9.6+git.1429568091.f79322c/heartbeat/ethmonitor 2015-04-21 08:11:26.000000000 +0200 +++ new/resource-agents-3.9.6+git.1430920897.b7ea7f9/heartbeat/ethmonitor 2015-05-08 19:36:26.000000000 +0200 @@ -176,6 +176,14 @@ <content type="integer" /> </parameter> +<parameter name="link_status_only"> +<longdesc lang="en"> +Only report success based on link status. Do not perform RX counter or arping related connectivity tests. +</longdesc> +<shortdesc lang="en">link status check only</shortdesc> +<content type="boolean" default="false" /> +</parameter> + </parameters> <actions> <action name="start" timeout="60s" /> @@ -378,6 +386,11 @@ return $OCF_NOT_RUNNING fi + # if using link_status_only, skip RX count and arping related tests + if ocf_is_true "$OCF_RESKEY_link_status_only"; then + return $OCF_SUCCESS + fi + # watch for packet counter changes ocf_log debug "watch for packet counter changes" watch_pkt_counter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.6+git.1429568091.f79322c/heartbeat/galera new/resource-agents-3.9.6+git.1430920897.b7ea7f9/heartbeat/galera --- old/resource-agents-3.9.6+git.1429568091.f79322c/heartbeat/galera 2015-04-21 08:11:26.000000000 +0200 +++ new/resource-agents-3.9.6+git.1430920897.b7ea7f9/heartbeat/galera 2015-05-08 19:36:26.000000000 +0200 @@ -342,6 +342,14 @@ master_exists() { + if [ "$__OCF_ACTION" = "demote" ]; then + # We don't want to detect master instances during demote. + # 1. we could be detecting ourselves as being master, which is no longer the case. + # 2. we could be detecting other master instances that are in the process of shutting down. + # by not detecting other master instances in "demote" we are deferring this check + # to the next recurring monitor operation which will be much more accurate + return 1 + fi # determine if a master instance is already up and is healthy crm_mon --as-xml | grep "resource.*id=\"${OCF_RESOURCE_INSTANCE}\".*role=\"Master\".*active=\"true\".*orphaned=\"false\".*failed=\"false\"" > /dev/null 2>&1 return $? @@ -441,6 +449,7 @@ extra_opts="--wsrep-cluster-address=gcomm://" else ocf_exit_reason "Failure, Attempted to promote Master instance of $OCF_RESOURCE_INSTANCE before bootstrap node has been detected." + clear_last_commit return $OCF_ERR_GENERIC fi fi @@ -452,9 +461,13 @@ clear_bootstrap_node ocf_log info "boostrap node already up, promoting the rest of the galera instances." fi + clear_last_commit return $OCF_SUCCESS fi + # last commit is no longer relevant once promoted + clear_last_commit + mysql_common_prepare_dirs mysql_common_start "$extra_opts" rc=$? @@ -491,9 +504,6 @@ wait_for_sync fi - # last commit is no longer relevant once promoted - clear_last_commit - ocf_log info "Galera started" return $OCF_SUCCESS }
