File pacemaker-crmd-cancel-incomplete-operations.patch of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-crmd-cancel-incomplete-operations.patch of Package pacemaker

commit c94b356a441ffc2c8326e0bd9774928c9207d18e
Author: David Vossel <dvossel@redhat.com>
Date:   Mon Aug 4 14:01:14 2014 -0400

High: crmd: When container's host is fenced, cancel in-flight operations

diff --git a/crmd/te_events.c b/crmd/te_events.c
index 02e1534..afe3072 100644
--- a/crmd/te_events.c
+++ b/crmd/te_events.c
@@ -37,7 +37,9 @@ int match_graph_event(int action_id, xmlNode * event, const char *event_node,
 gboolean
 fail_incompletable_actions(crm_graph_t * graph, const char *down_node)
 {
-    const char *target = NULL;
+    const char *target_uuid = NULL;
+    const char *router = NULL;
+    const char *router_uuid = NULL;
     xmlNode *last_action = NULL;
 
     GListPtr gIter = NULL;
@@ -69,8 +71,16 @@ fail_incompletable_actions(crm_graph_t * graph, const char *down_node)
                 }
             }
 
-            target = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
-            if (safe_str_eq(target, down_node)) {
+            target_uuid = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
+            router = crm_element_value(action->xml, XML_LRM_ATTR_ROUTER_NODE);
+            if (router) {
+                crm_node_t *node = crm_get_peer(0, router);
+                if (node) {
+                    router_uuid = node->uuid;
+                }
+            }
+
+            if (safe_str_eq(target_uuid, down_node) || safe_str_eq(router_uuid, down_node)) {
                 action->failed = TRUE;
                 synapse->failed = TRUE;
                 last_action = action->xml;

Places

File pacemaker-crmd-cancel-incomplete-operations.patch of Package pacemaker

Places