diff -Nru pacemaker-1.1.6/debian/changelog pacemaker-1.1.6/debian/changelog --- pacemaker-1.1.6/debian/changelog 2013-06-27 14:57:46.000000000 +0000 +++ pacemaker-1.1.6/debian/changelog 2014-04-04 16:27:43.000000000 +0000 @@ -1,3 +1,10 @@ +pacemaker (1.1.6-2ubuntu3.2) precise; urgency=low + + * debian/patches/Low-cib-If-we-received-the-message-the-peer-is-activ.patch: + Fix issues where syncing fails during reboots. (LP: #1302633) + + -- Chris J Arges Thu, 03 Apr 2014 09:26:29 -0500 + pacemaker (1.1.6-2ubuntu3.1) precise-proposed; urgency=low * debian/patches/cib-segfault.patch: Fix segfault caused by diff -Nru pacemaker-1.1.6/debian/patches/Low-cib-If-we-received-the-message-the-peer-is-activ.patch pacemaker-1.1.6/debian/patches/Low-cib-If-we-received-the-message-the-peer-is-activ.patch --- pacemaker-1.1.6/debian/patches/Low-cib-If-we-received-the-message-the-peer-is-activ.patch 1970-01-01 00:00:00.000000000 +0000 +++ pacemaker-1.1.6/debian/patches/Low-cib-If-we-received-the-message-the-peer-is-activ.patch 2014-04-04 16:37:05.000000000 +0000 @@ -0,0 +1,38 @@ +Description: Low: cib: If we received the message, the peer is active + enough for us to process it +Origin: https://github.com/ClusterLabs/pacemaker/commit/03f6105592281901cc10550b8ad19af4beb5f72f +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/1302633/ +Author: Andrew Beekhof + +diff --git a/cib/callbacks.c b/cib/callbacks.c +index 4f4818f..b659178 100644 +--- a/cib/callbacks.c ++++ b/cib/callbacks.c +@@ -1163,7 +1163,6 @@ cib_ha_peer_callback(HA_Message * msg, void* private_data) + void + cib_peer_callback(xmlNode * msg, void* private_data) + { +- crm_node_t *node = NULL; + const char *reason = NULL; + const char *originator = crm_element_value(msg, F_ORIG); + +@@ -1176,14 +1175,8 @@ cib_peer_callback(xmlNode * msg, void* private_data) + goto bail; + } + +- node = crm_get_peer(0, originator); +- if(node == NULL || (node->processes & crm_proc_cib) == 0) { +- reason = "not in our membership"; +- goto bail; +- } +- +- if(crm_element_value(msg, F_CIB_CLIENTNAME) == NULL) { +- crm_xml_add(msg, F_CIB_CLIENTNAME, originator); ++ if (crm_element_value(msg, F_CIB_CLIENTNAME) == NULL) { ++ crm_xml_add(msg, F_CIB_CLIENTNAME, originator); + } + + /* crm_log_xml(LOG_MSG, "Peer[inbound]", msg); */ +-- +1.7.9.5 + diff -Nru pacemaker-1.1.6/debian/patches/series pacemaker-1.1.6/debian/patches/series --- pacemaker-1.1.6/debian/patches/series 2013-06-27 14:47:46.000000000 +0000 +++ pacemaker-1.1.6/debian/patches/series 2014-04-03 14:26:16.000000000 +0000 @@ -1,2 +1,3 @@ raexecupstart.patch cib-segfault.patch +Low-cib-If-we-received-the-message-the-peer-is-activ.patch