[PATCH] Update node values in cib on clean shutdown

[Vladislav Bogdanov]

---
 crmd/callbacks.c  |    6 +++++-
 crmd/membership.c |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/crmd/callbacks.c b/crmd/callbacks.c
index 3dae17b..9cfb973 100644
--- a/crmd/callbacks.c
+++ b/crmd/callbacks.c
@@ -162,6 +162,8 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d
             } else if (safe_str_eq(node->uname, fsa_our_dc) && crm_is_peer_active(node) == FALSE) {
                 /* Did the DC leave us? */
                 crm_notice("Our peer on the DC (%s) is dead", fsa_our_dc);
+                /* FIXME: is it safe? */
+                crm_update_peer_expected(__FUNCTION__, node, CRMD_JOINSTATE_DOWN);
                 register_fsa_input(C_CRMD_STATUS_CALLBACK, I_ELECTION, NULL);
             }
             break;
@@ -169,6 +171,7 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d
 
     if (AM_I_DC) {
         xmlNode *update = NULL;
+        int flags = node_update_peer;
         gboolean alive = crm_is_peer_active(node);
         crm_action_t *down = match_down_event(0, node->uuid, NULL, appeared);
 
@@ -199,6 +202,7 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d
 
                 crm_update_peer_join(__FUNCTION__, node, crm_join_none);
                 crm_update_peer_expected(__FUNCTION__, node, CRMD_JOINSTATE_DOWN);
+                flags |= node_update_cluster | node_update_join | node_update_expected;
                 check_join_state(fsa_state, __FUNCTION__);
 
                 update_graph(transition_graph, down);
@@ -221,7 +225,7 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d
             crm_trace("Other %p", down);
         }
 
-        update = do_update_node_cib(node, node_update_peer, NULL, __FUNCTION__);
+        update = do_update_node_cib(node, flags, NULL, __FUNCTION__);
         fsa_cib_anon_update(XML_CIB_TAG_STATUS, update,
                             cib_scope_local | cib_quorum_override | cib_can_create);
         free_xml(update);
diff --git a/crmd/membership.c b/crmd/membership.c
index be1863a..d68b3aa 100644
--- a/crmd/membership.c
+++ b/crmd/membership.c
@@ -152,7 +152,7 @@ do_update_node_cib(crm_node_t * node, int flags, xmlNode * parent, const char *s
     crm_xml_add(node_state, XML_ATTR_UNAME, node->uname);
 
     if (flags & node_update_cluster) {
-        if (safe_str_eq(node->state, CRM_NODE_ACTIVE)) {
+        if (crm_is_peer_active(node)) {
             value = XML_BOOLEAN_YES;
         } else if (node->state) {
             value = XML_BOOLEAN_NO;
-- 
1.7.1