Skip to content

Commit

Permalink
Merge pull request #665 from gao-yan/reset-stonith-failcount
Browse files Browse the repository at this point in the history
Fix: crmd: Reset stonith failcount to recover transitioner when the node rejoins
  • Loading branch information
beekhof committed Mar 24, 2015
2 parents 6c3b705 + 53d7d54 commit fe7503a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions crmd/callbacks.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d
if (alive && safe_str_eq(task, CRM_OP_FENCE)) {
crm_info("Node return implies stonith of %s (action %d) completed", node->uname,
down->id);

st_fail_count_reset(node->uname);

erase_status_tag(node->uname, XML_CIB_TAG_LRM, cib_scope_local);
erase_status_tag(node->uname, XML_TAG_TRANSIENT_NODEATTRS, cib_scope_local);
/* down->confirmed = TRUE; Only stonith-ng returning should imply completion */
Expand Down

0 comments on commit fe7503a

Please sign in to comment.