File pacemaker-crmd-log-transition-ID-when-aborting.... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-crmd-log-transition-ID-when-aborting.patch of Package pacemaker

commit faa17b706937f5880b58d8e5b9ecad4f6353f934
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Wed Feb 21 16:47:24 2018 -0600

Log: crmd: log transition ID when aborting

diff --git a/crmd/te_utils.c b/crmd/te_utils.c
index 00a509120..319cb1715 100644
--- a/crmd/te_utils.c
+++ b/crmd/te_utils.c
@@ -574,16 +574,16 @@ abort_transition_graph(int abort_priority, enum transition_action abort_action,
     }
 
     if(reason == NULL) {
-        do_crm_log(level, "Transition aborted: %s "CRM_XS" source=%s:%d complete=%s",
-                   abort_text, fn, line,
+        do_crm_log(level, "Transition %d aborted: %s "CRM_XS" source=%s:%d complete=%s",
+                   transition_graph->id, abort_text, fn, line,
                    (transition_graph->complete? "true" : "false"));
 
     } else if(change == NULL) {
         char *local_path = xml_get_path(reason);
 
-        do_crm_log(level, "Transition aborted by %s.%s: %s "
+        do_crm_log(level, "Transition %d aborted by %s.%s: %s "
                    CRM_XS " cib=%d.%d.%d source=%s:%d path=%s complete=%s",
-                   TYPE(reason), ID(reason), abort_text,
+                   transition_graph->id, TYPE(reason), ID(reason), abort_text,
                    add[0], add[1], add[2], fn, line, local_path,
                    (transition_graph->complete? "true" : "false"));
         free(local_path);
@@ -609,15 +609,17 @@ abort_transition_graph(int abort_priority, enum transition_action abort_action,
         if(strcmp(op, "delete") == 0) {
             const char *shortpath = strrchr(path, '/');
 
-            do_crm_log(level, "Transition aborted by deletion of %s: %s "
+            do_crm_log(level, "Transition %d aborted by deletion of %s: %s "
                        CRM_XS " cib=%d.%d.%d source=%s:%d path=%s complete=%s",
+                       transition_graph->id,
                        (shortpath? (shortpath + 1) : path), abort_text,
                        add[0], add[1], add[2], fn, line, path,
                        (transition_graph->complete? "true" : "false"));
 
         } else if (safe_str_eq(XML_CIB_TAG_NVPAIR, kind)) { 
-            do_crm_log(level, "Transition aborted by %s doing %s %s=%s: %s "
+            do_crm_log(level, "Transition %d aborted by %s doing %s %s=%s: %s "
                        CRM_XS " cib=%d.%d.%d source=%s:%d path=%s complete=%s",
+                       transition_graph->id,
                        crm_element_value(reason, XML_ATTR_ID), op,
                        crm_element_value(reason, XML_NVPAIR_ATTR_NAME),
                        crm_element_value(reason, XML_NVPAIR_ATTR_VALUE),
@@ -627,8 +629,9 @@ abort_transition_graph(int abort_priority, enum transition_action abort_action,
         } else if (safe_str_eq(XML_LRM_TAG_RSC_OP, kind)) {
             const char *magic = crm_element_value(reason, XML_ATTR_TRANSITION_MAGIC);
 
-            do_crm_log(level, "Transition aborted by operation %s '%s' on %s: %s "
+            do_crm_log(level, "Transition %d aborted by operation %s '%s' on %s: %s "
                        CRM_XS " magic=%s cib=%d.%d.%d source=%s:%d complete=%s",
+                       transition_graph->id,
                        crm_element_value(reason, XML_LRM_ATTR_TASK_KEY), op,
                        crm_element_value(reason, XML_LRM_ATTR_TARGET), abort_text,
                        magic, add[0], add[1], add[2], fn, line,
@@ -638,8 +641,9 @@ abort_transition_graph(int abort_priority, enum transition_action abort_action,
                    || safe_str_eq(XML_CIB_TAG_NODE, kind)) {
             const char *uname = crm_peer_uname(ID(reason));
 
-            do_crm_log(level, "Transition aborted by %s '%s' on %s: %s "
+            do_crm_log(level, "Transition %d aborted by %s '%s' on %s: %s "
                        CRM_XS " cib=%d.%d.%d source=%s:%d complete=%s",
+                       transition_graph->id,
                        kind, op, (uname? uname : ID(reason)), abort_text,
                        add[0], add[1], add[2], fn, line,
                        (transition_graph->complete? "true" : "false"));
@@ -647,8 +651,9 @@ abort_transition_graph(int abort_priority, enum transition_action abort_action,
         } else {
             const char *id = ID(reason);
 
-            do_crm_log(level, "Transition aborted by %s.%s '%s': %s "
+            do_crm_log(level, "Transition %d aborted by %s.%s '%s': %s "
                        CRM_XS " cib=%d.%d.%d source=%s:%d path=%s complete=%s",
+                       transition_graph->id,
                        TYPE(reason), (id? id : ""), (op? op : "change"),
                        abort_text, add[0], add[1], add[2], fn, line, path,
                        (transition_graph->complete? "true" : "false"));

Places

File pacemaker-crmd-log-transition-ID-when-aborting.patch of Package pacemaker

Places