File pacemaker-crmd-fencing-result-message.patch of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-crmd-fencing-result-message.patch of Package pacemaker

commit 8f5a206deaa0da289ca03b7952945c8248bf248a
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Tue Apr 18 15:24:37 2017 -0500

Log: crmd: improve fencing result message

diff --git a/crmd/te_utils.c b/crmd/te_utils.c
index dcfbb3b90..9fd4c9f0b 100644
--- a/crmd/te_utils.c
+++ b/crmd/te_utils.c
@@ -267,12 +267,14 @@ tengine_stonith_notify(stonith_t * st, stonith_event_t * st_event)
         }
     }
 
-    crm_notice("Peer %s was%s terminated (%s) by %s for %s: %s (ref=%s) by client %s",
+    crm_notice("Peer %s was%s terminated (%s) by %s on behalf of %s: %s "
+               CRM_XS " initiator=%s ref=%s",
                st_event->target, st_event->result == pcmk_ok ? "" : " not",
                st_event->action,
                st_event->executioner ? st_event->executioner : "<anyone>",
-               st_event->origin, pcmk_strerror(st_event->result), st_event->id,
-               st_event->client_origin ? st_event->client_origin : "<unknown>");
+               (st_event->client_origin? st_event->client_origin : "<unknown>"),
+               pcmk_strerror(st_event->result),
+               st_event->origin, st_event->id);
 
 #if SUPPORT_CMAN
     if (st_event->result == pcmk_ok && is_cman_cluster()) {
diff --git a/cts/patterns.py b/cts/patterns.py
index 305ea7396..0230f12f6 100644
--- a/cts/patterns.py
+++ b/cts/patterns.py
@@ -62,7 +62,7 @@ class BasePatterns:
 
             "Pat:RscOpOK"       : r"crmd.*:\s+Result of %s operation for %s.*: (0 \()?ok",
             "Pat:RscRemoteOpOK" : r"crmd.*:\s+Result of %s operation for %s on %s: (0 \()?ok",
-            "Pat:NodeFenced"    : r"crmd.*:\s*Peer\s+%s\s+was\s+terminated\s+\(.*\)\s+by\s+.*\s+for\s+.*:\s+OK",
+            "Pat:NodeFenced"    : r"crmd.*:\s* Peer %s was terminated \(.*\) by .* on behalf of .*: OK",
             "Pat:FenceOpOK"     : "Operation .* for host '%s' with device .* returned: 0",
         }

Places

File pacemaker-crmd-fencing-result-message.patch of Package pacemaker

Places