File bsc#1133866-0002-Log-controller-improve-failed-... of Package pacemaker.13547

Overview Repositories Revisions Requests Users Attributes Meta

File bsc#1133866-0002-Log-controller-improve-failed-recurring-action-messa-1.1.patch of Package pacemaker.13547

From 3a8c61bc744a3f59d097403231a4f3f3c39a990c Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Fri, 22 Mar 2019 17:49:30 -0500
Subject: [PATCH 4/5] Log: controller: improve failed recurring action messages

Recurring action status changes can be reported in any later transition, not
just the one they were initially scheduled in. Previously, they would be logged
as an "Old event". Now, distinguish this situation.
---
 crmd/te_events.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/crmd/te_events.c b/crmd/te_events.c
index 1f7a34c70..eb1a8ca11 100644
--- a/crmd/te_events.c
+++ b/crmd/te_events.c
@@ -1,19 +1,10 @@
 /*
- * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
+ * Copyright 2004-2019 the Pacemaker project contributors
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * The version control history for this file may have further details.
  *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * This source code is licensed under the GNU General Public License version 2
+ * or later (GPLv2+) WITHOUT ANY WARRANTY.
  */
 
 #include <crm_internal.h>
@@ -495,8 +486,21 @@ process_graph_event(xmlNode *event, const char *event_node)
         abort_transition(INFINITY, tg_restart, "Foreign event", event);
 
     } else if (transition_graph->id != transition_num) {
-        desc = "arrived really late";
-        abort_transition(INFINITY, tg_restart, "Old event", event);
+        int interval_ms = 0;
+
+        if (parse_op_key(id, NULL, NULL, &interval_ms)
+            && (interval_ms != 0)) {
+            /* Recurring actions have the transition number they were first
+             * scheduled in.
+             */
+            desc = "arrived after initial scheduling";
+            abort_transition(INFINITY, tg_restart, "Change in recurring result",
+                             event);
+
+        } else {
+            desc = "arrived really late";
+            abort_transition(INFINITY, tg_restart, "Old event", event);
+        }
 
     } else if (transition_graph->complete) {
         desc = "arrived late";
-- 
2.16.4

Places

File bsc#1133866-0002-Log-controller-improve-failed-recurring-action-messa-1.1.patch of Package pacemaker.13547

Places