Fix: crm_mon: Do not display duplicates of failed actions

beekhof · Sep 4, 2013 · a32474b · a32474b
1 parent 18202da
commit a32474b
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
@@ -2221,16 +2221,12 @@ unpack_rsc_op_failure(resource_t *rsc, node_t *node, int rc, xmlNode *xml_op, en
     }
 
     if (rc != PCMK_OCF_NOT_INSTALLED || is_set(data_set->flags, pe_flag_symmetric_cluster)) {
+        crm_xml_add(xml_op, XML_ATTR_UNAME, node->details->uname);
         if ((node->details->shutdown == FALSE) || (node->details->online == TRUE)) {
             add_node_copy(data_set->failed, xml_op);
         }
     }
 
-    crm_xml_add(xml_op, XML_ATTR_UNAME, node->details->uname);
-    if ((node->details->shutdown == FALSE) || (node->details->online == TRUE)) {
-        add_node_copy(data_set->failed, xml_op);
-    }
-
     action = custom_action(rsc, strdup(key), task, NULL, TRUE, FALSE, data_set);
     if ((action->on_fail <= action_fail_fence && *on_fail < action->on_fail) ||
         (action->on_fail == action_fail_restart_container
@@ -2756,9 +2752,10 @@ unpack_rsc_op(resource_t * rsc, node_t * node, xmlNode * xml_op,
                 set_bit(rsc->flags, pe_rsc_failure_ignored);
 
                 if ((node->details->shutdown == FALSE) || (node->details->online == TRUE)) {
+                    crm_xml_add(xml_op, XML_ATTR_UNAME, node->details->uname);
                     add_node_copy(data_set->failed, xml_op);
                 }
-                
+
                 if (failure_strategy == action_fail_restart_container && *on_fail <= action_fail_recover) {
                     *on_fail = failure_strategy;
                 }