|
 |
fada68 |
From 29cbb5d0165397be01a8f54147d2e147d83a5798 Mon Sep 17 00:00:00 2001
|
|
|
fada68 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
fada68 |
Date: Fri, 5 Aug 2016 16:49:30 -0500
|
|
|
fada68 |
Subject: [PATCH] Fix: crmd: clear remote node operation history only when it
|
|
|
fada68 |
comes up
|
|
|
fada68 |
|
|
|
fada68 |
---
|
|
|
fada68 |
crmd/remote_lrmd_ra.c | 10 ++++------
|
|
|
fada68 |
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
fada68 |
|
|
|
fada68 |
diff --git a/crmd/remote_lrmd_ra.c b/crmd/remote_lrmd_ra.c
|
|
|
fada68 |
index c347bb1..02218eb 100644
|
|
|
fada68 |
--- a/crmd/remote_lrmd_ra.c
|
|
|
fada68 |
+++ b/crmd/remote_lrmd_ra.c
|
|
|
fada68 |
@@ -178,10 +178,9 @@ remote_node_up(const char *node_name)
|
|
|
fada68 |
CRM_CHECK(node_name != NULL, return);
|
|
|
fada68 |
crm_info("Announcing pacemaker_remote node %s", node_name);
|
|
|
fada68 |
|
|
|
fada68 |
- /* Clear node's operation history and transient attributes.
|
|
|
fada68 |
- * This should and normally will be done when the node leaves,
|
|
|
fada68 |
- * but since remote node state has a number of corner cases,
|
|
|
fada68 |
- * we additionally clear it on startup to be sure.
|
|
|
fada68 |
+ /* Clear node's operation history. The node's transient attributes should
|
|
|
fada68 |
+ * and normally will be cleared when the node leaves, but since remote node
|
|
|
fada68 |
+ * state has a number of corner cases, clear them here as well, to be sure.
|
|
|
fada68 |
*/
|
|
|
fada68 |
call_opt = crmd_cib_smart_opt();
|
|
|
fada68 |
erase_status_tag(node_name, XML_CIB_TAG_LRM, call_opt);
|
|
|
fada68 |
@@ -243,8 +242,7 @@ remote_node_down(const char *node_name)
|
|
|
fada68 |
/* Purge node from attrd's memory */
|
|
|
fada68 |
update_attrd_remote_node_removed(node_name, NULL);
|
|
|
fada68 |
|
|
|
fada68 |
- /* Purge node's operation history and transient attributes from CIB */
|
|
|
fada68 |
- erase_status_tag(node_name, XML_CIB_TAG_LRM, call_opt);
|
|
|
fada68 |
+ /* Purge node's transient attributes */
|
|
|
fada68 |
erase_status_tag(node_name, XML_TAG_TRANSIENT_NODEATTRS, call_opt);
|
|
|
fada68 |
|
|
|
fada68 |
/* Ensure node is in the remote peer cache with lost state */
|
|
|
fada68 |
--
|
|
|
fada68 |
1.8.3.1
|
|
|
fada68 |
|