From b542a8f667002519fbc07693a796553746c43c12 Mon Sep 17 00:00:00 2001 From: Reid Wahl Date: Sat, 11 Jul 2020 18:31:55 -0700 Subject: [PATCH] Log: controld: Show action timer plus cluster-delay in action_timer cb `action_timer_callback()` prints a misleading error message. If it times out waiting for an action result, the error message prints the timeout value followed by "(action timeout plus cluster-delay)". However, only the `action->timeout` value is displayed. `cluster-delay` is not added in. Resolves: RHBZ#1856035 --- daemons/controld/controld_te_callbacks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemons/controld/controld_te_callbacks.c b/daemons/controld/controld_te_callbacks.c index 8506f26..6ddaffe 100644 --- a/daemons/controld/controld_te_callbacks.c +++ b/daemons/controld/controld_te_callbacks.c @@ -697,7 +697,8 @@ action_timer_callback(gpointer data) crm_err("Node %s did not send %s result (via %s) within %dms " "(action timeout plus cluster-delay)", (on_node? on_node : ""), (task? task : "unknown action"), - (via_node? via_node : "controller"), timer->timeout); + (via_node? via_node : "controller"), + timer->timeout + transition_graph->network_delay); print_action(LOG_ERR, "Aborting transition, action lost: ", timer->action); timer->action->failed = TRUE; -- 1.8.3.1