File bug-870771_pacemaker-cluster-conditionally-detect-conflicting-peer.patch of Package pacemaker.9287
commit f51c05d1ca2de05295554922f8ce01a1e6db3d99
Author: Gao,Yan <ygao@suse.com>
Date: Wed Sep 3 13:41:52 2014 +0800
Fix: cluster: Invoke crm_remove_conflicting_peer() only when the new node's uname is being assigned in the node cache
diff --git a/lib/cluster/membership.c b/lib/cluster/membership.c
index 479af63..9410506 100644
--- a/lib/cluster/membership.c
+++ b/lib/cluster/membership.c
@@ -518,6 +518,12 @@ crm_get_peer(unsigned int id, const char *uname)
if (crm_status_callback) {
crm_status_callback(crm_status_uname, node, NULL);
}
+
+#if SUPPORT_COROSYNC
+ if (is_openais_cluster()) {
+ crm_remove_conflicting_peer(node);
+ }
+#endif
}
if(node->uuid == NULL) {
@@ -533,12 +539,6 @@ crm_get_peer(unsigned int id, const char *uname)
free(uname_lookup);
-#if SUPPORT_COROSYNC
- if (is_openais_cluster()) {
- crm_remove_conflicting_peer(node);
- }
-#endif
-
return node;
}