commit de876a58b6cd80389f7f345784a15080056faf9d
Author: Andrew Beekhof <andrew@beekhof.net>
Date: Thu Apr 10 08:59:04 2014 +1000
Fix: crmd: Do not erase the status section for unfenced nodes
(cherry picked from commit ac788bf0eed36eeb489e7c6e9bcf5c5ded91fd44)
Conflicts:
crmd/te_callbacks.c
diff --git a/crmd/te_callbacks.c b/crmd/te_callbacks.c
index 4b8aac5..ce8ae9c 100644
--- a/crmd/te_callbacks.c
+++ b/crmd/te_callbacks.c
@@ -442,11 +442,12 @@ tengine_stonith_callback(stonith_t * stonith, stonith_callback_data_t * data)
if (rc == pcmk_ok) {
const char *target = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
const char *uuid = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
+ const char *op = crm_meta_value(action->params, "stonith_action");
crm_debug("Stonith operation %d for %s passed", call_id, target);
if (action->confirmed == FALSE) {
action->confirmed = TRUE;
- if (action->sent_update == FALSE) {
+ if (action->sent_update == FALSE && safe_str_neq("on", op)) {
send_stonith_update(action, target, uuid);
}
}