Hello community, here is the log from the commit of package pacemaker for openSUSE:Factory checked in at 2015-04-06 00:26:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pacemaker (Old) and /work/SRC/openSUSE:Factory/.pacemaker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pacemaker" Changes: -------- --- /work/SRC/openSUSE:Factory/pacemaker/pacemaker.changes 2015-03-25 21:02:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker.changes 2015-04-06 00:26:09.000000000 +0200 @@ -1,0 +2,36 @@ +Fri Mar 27 15:09:25 UTC 2015 - ygao@suse.com + +- Rebase: + * bug-806256_pacemaker-log-level-notice.patch + * pacemaker-NodeUtilization-RA.patch + * pacemaker-colocated-utilization.patch + +- crmd: All peers need to track node shutdown requests (bsc#917625) +- crmd: Cached copies of transient attributes cease to be valid once a node leaves the membership (bsc#917625) +- crmd: Wait for all pending operations to complete before poking the policy engine +- lrmd: preserve exit reason string when isolation wrappers are in use +- docker-wrapper: properly separate docker and resource specific attributes +- docker-wrapper: set authkey file permissions and properly set container 'node name' during start +- systemd: Trick systemd into not stopping our services before us during shutdown +- mcp: Allow a configurable delay when debugging shutdown issues +- systemd: Kindly ask dbus NOT to kill the process if the dbus connection fails +- systemd: Tell systemd not to take DBus down from underneath us +- cib: Correctly set up signal handlers +- PE: Do not record duplicate copies of the failed actions +- lrmd: enable ipc proxy for docker-wrapper privileged mode +- lrmd: properly handle poke requests in lrmd client when using ipc +- spec: add docker-wrapper directory to spec file +- pengine: disable migrations for resources with isolation containers +- pengine: disable reloading of resources within isolated container wrappers +- pengine: ability to launch resources in isolated containers +- extra: docker container tech wrapper script for pcmk remote +- tools: crm_mon prints Stopped clones only if --inactive was specified +- tools: display node names more consistently in crm_mon output +- tools: Improve crm_mon output with certain option combinations +- tools: make crm_mon last updated header consistent across formats +- remote: pcmk remote client tool for use with container wrapper script +- crmd: Reset stonith failcount to recover transitioner when the node rejoins (bsc#921102) +- systemd: fix crash caused when canceling in-flight operation +- Upstream version cs: 3e93bc1dd6c1c3f2ee101f754567aa007b24bb5e + +------------------------------------------------------------------- Old: ---- pacemaker-1.1.12.git20150313.e32080b.tar.bz2 New: ---- pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker.spec ++++++ --- /var/tmp/diff_new_pack.82yndf/_old 2015-04-06 00:26:10.000000000 +0200 +++ /var/tmp/diff_new_pack.82yndf/_new 2015-04-06 00:26:10.000000000 +0200 @@ -99,7 +99,7 @@ Summary: Scalable High-Availability cluster resource manager License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 1.1.12.git20150313.e32080b +Version: 1.1.12.git20150326.3e93bc1 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org @@ -657,6 +657,7 @@ %dir /usr/lib/ocf %dir /usr/lib/ocf/resource.d /usr/lib/ocf/resource.d/pacemaker +/usr/lib/ocf/resource.d/containers %if 0%{?cs_version} < 2 %{_libexecdir}/lcrso/pacemaker.lcrso ++++++ _service ++++++ --- /var/tmp/diff_new_pack.82yndf/_old 2015-04-06 00:26:10.000000000 +0200 +++ /var/tmp/diff_new_pack.82yndf/_new 2015-04-06 00:26:10.000000000 +0200 @@ -11,7 +11,7 @@ <param name="version">1.1.12</param> --> <param name="versionformat">1.1.12.git%cd.%h</param> - <param name="revision">e32080b460f81486b85d08ec958582b3e72d858c</param> + <param name="revision">3e93bc1dd6c1c3f2ee101f754567aa007b24bb5e</param> </service> <service name="recompress" mode="disabled"> ++++++ bug-806256_pacemaker-log-level-notice.patch ++++++ --- /var/tmp/diff_new_pack.82yndf/_old 2015-04-06 00:26:10.000000000 +0200 +++ /var/tmp/diff_new_pack.82yndf/_new 2015-04-06 00:26:10.000000000 +0200 @@ -8,20 +8,20 @@ =================================================================== --- pacemaker.orig/crmd/callbacks.c +++ pacemaker/crmd/callbacks.c -@@ -182,7 +182,7 @@ peer_update_callback(enum crm_status_typ +@@ -204,7 +204,7 @@ peer_update_callback(enum crm_status_typ const char *task = crm_element_value(down->xml, XML_LRM_ATTR_TASK); if (alive && safe_str_eq(task, CRM_OP_FENCE)) { - crm_info("Node return implies stonith of %s (action %d) completed", node->uname, + crm_notice("Node return implies stonith of %s (action %d) completed", node->uname, down->id); - erase_status_tag(node->uname, XML_CIB_TAG_LRM, cib_scope_local); - erase_status_tag(node->uname, XML_TAG_TRANSIENT_NODEATTRS, cib_scope_local); + + st_fail_count_reset(node->uname); Index: pacemaker/crmd/membership.c =================================================================== --- pacemaker.orig/crmd/membership.c +++ pacemaker/crmd/membership.c -@@ -312,7 +312,7 @@ crm_update_quorum(gboolean quorum, gbool +@@ -430,7 +430,7 @@ crm_update_quorum(gboolean quorum, gbool crm_xml_add(update, XML_ATTR_DC_UUID, fsa_our_uuid); fsa_cib_update(XML_TAG_CIB, update, call_options, call_id, NULL); @@ -47,7 +47,7 @@ =================================================================== --- pacemaker.orig/fencing/remote.c +++ pacemaker/fencing/remote.c -@@ -345,7 +345,7 @@ remote_op_timeout(gpointer userdata) +@@ -374,7 +374,7 @@ remote_op_timeout(gpointer userdata) return FALSE; } @@ -55,4 +55,4 @@ + crm_notice("Action %s (%s) for %s (%s) timed out", op->action, op->id, op->target, op->client_name); op->state = st_failed; - + ++++++ pacemaker-1.1.12.git20150313.e32080b.tar.bz2 -> pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/pacemaker/pacemaker-1.1.12.git20150313.e32080b.tar.bz2 /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 differ: char 11, line 1 ++++++ pacemaker-NodeUtilization-RA.patch ++++++ --- /var/tmp/diff_new_pack.82yndf/_old 2015-04-06 00:26:10.000000000 +0200 +++ /var/tmp/diff_new_pack.82yndf/_new 2015-04-06 00:26:10.000000000 +0200 @@ -8,7 +8,7 @@ =================================================================== --- pacemaker.orig/extra/resources/Makefile.am +++ pacemaker/extra/resources/Makefile.am -@@ -33,7 +33,8 @@ ocf_SCRIPTS = ClusterMon \ +@@ -37,7 +37,8 @@ ocf_SCRIPTS = ClusterMon \ Stateful \ SysInfo \ SystemHealth \ @@ -16,8 +16,8 @@ + remote \ + NodeUtilization - if BUILD_XML_HELP - + containertech_SCRIPTS = docker-wrapper + Index: pacemaker/extra/resources/NodeUtilization =================================================================== --- /dev/null ++++++ pacemaker-colocated-utilization.patch ++++++ --- /var/tmp/diff_new_pack.82yndf/_old 2015-04-06 00:26:10.000000000 +0200 +++ /var/tmp/diff_new_pack.82yndf/_new 2015-04-06 00:26:10.000000000 +0200 @@ -321,7 +321,7 @@ constraint->score >= 0 ? "" : "Anti-", rsc_lh->id, rsc_rh->id, constraint->id, constraint->score, filter_results); @@ -3307,3 +3447,86 @@ native_append_meta(resource_t * rsc, xml - free(name); + break; } } +