Blame SOURCES/bz720543-pcmk-fencing_do_not_broadcast_suicide_if_the_on_action_is_being_executed.patch
|
 |
ed0026 |
commit c041f6362e9e33e78e2645ae7c10f5aa2ad41874
|
|
|
ed0026 |
Author: David Vossel <dvossel@redhat.com>
|
|
|
ed0026 |
Date: Tue Oct 1 17:12:17 2013 -0500
|
|
|
ed0026 |
|
|
|
ed0026 |
Low: fencing: Do not broadcast suicide if the on action is being executed
|
|
|
ed0026 |
|
|
|
ed0026 |
(cherry picked from commit fd5d4e2f3b61a614f92781bd4280efe282bc142a)
|
|
|
ed0026 |
|
|
|
ed0026 |
diff --git a/fencing/commands.c b/fencing/commands.c
|
|
|
ed0026 |
index 7d04952..909dc24 100644
|
|
|
ed0026 |
--- a/fencing/commands.c
|
|
|
ed0026 |
+++ b/fencing/commands.c
|
|
|
ed0026 |
@@ -1352,7 +1352,7 @@ stonith_send_async_reply(async_command_t * cmd, const char *output, int rc, GPid
|
|
|
ed0026 |
crm_str_eq(cmd->action, "list", TRUE) || crm_str_eq(cmd->action, "status", TRUE)) {
|
|
|
ed0026 |
crm_trace("Never broadcast %s replies", cmd->action);
|
|
|
ed0026 |
|
|
|
ed0026 |
- } else if (!stand_alone && safe_str_eq(cmd->origin, cmd->victim)) {
|
|
|
ed0026 |
+ } else if (!stand_alone && safe_str_eq(cmd->origin, cmd->victim) && safe_str_neq(cmd->action, "on")) {
|
|
|
ed0026 |
crm_trace("Broadcast %s reply for %s", cmd->action, cmd->victim);
|
|
|
ed0026 |
crm_xml_add(reply, F_SUBTYPE, "broadcast");
|
|
|
ed0026 |
bcast = TRUE;
|