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