Accepting request 294323 from network:ha-clustering:Factory

Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/294323 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=86
2015-04-05 22:26:07 +00:00 · 2015-04-05 22:26:07 +00:00 · 8faefc2bb1
commit 8faefc2bb1
parent d29887dfb2 9180cec92b
8 changed files with 52 additions and 15 deletions
--- a/2
+++ b/2
@ -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">
--- a/bug-806256_pacemaker-log-level-notice.patch
+++ b/bug-806256_pacemaker-log-level-notice.patch
@ -8,20 +8,20 @@ Index: pacemaker/crmd/callbacks.c
 ===================================================================
 --- 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 @@ Index: pacemaker/fencing/remote.c
 ===================================================================
 --- 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 @@ Index: pacemaker/fencing/remote.c
 +    crm_notice("Action %s (%s) for %s (%s) timed out",
               op->action, op->id, op->target, op->client_name);
     op->state = st_failed;
-
+ 
--- a/pacemaker-1.1.12.git20150313.e32080b.tar.bz2
+++ b/pacemaker-1.1.12.git20150313.e32080b.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a95672698193dd9d8b51b2c0220d1755c5634c0984d5f9e133cea0a98cf62633
-size 9441027
--- a/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2
+++ b/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb261c04ef0c746ca0f690856d9bdd23374d50accc938d08805df2176f64ff60
+size 9567712
--- a/pacemaker-NodeUtilization-RA.patch
+++ b/pacemaker-NodeUtilization-RA.patch
@ -8,7 +8,7 @@ Index: pacemaker/extra/resources/Makefile.am
 ===================================================================
 --- 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 @@ Index: pacemaker/extra/resources/Makefile.am
 +			remote \
 +			NodeUtilization
 
- if BUILD_XML_HELP
-
+ containertech_SCRIPTS	= docker-wrapper
+ 
 Index: pacemaker/extra/resources/NodeUtilization
 ===================================================================
 --- /dev/null
--- a/pacemaker-colocated-utilization.patch
+++ b/pacemaker-colocated-utilization.patch
@ -321,7 +321,7 @@ Index: pacemaker/pengine/native.c
                  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;
     }
 }
 +
--- a/pacemaker.changes
+++ b/pacemaker.changes
@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Fri Mar 13 09:38:52 UTC 2015 - ygao@suse.com

--- a/pacemaker.spec
+++ b/pacemaker.spec
@ -99,7 +99,7 @@ Name:           pacemaker
 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 @@ fi
 %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