From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 16 Sep 2019 18:25:55 +0000 (-0400)
Subject: watchfrr: Convert `wtf` to a more meaningful message
X-Git-Tag: base_7.3~347^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F4988%2Fhead;p=mirror%2Ffrr.git

watchfrr: Convert `wtf` to a more meaningful message

There is a fairly common state we are seeing where watchfrr
has decided that something is not right and is printing out
a `wtf` message.  At this point I am not sure what is going on
or how we are getting here, but let's add a bit more data dump
to the message so that we can figure out what is going on.

This is mainly being done because at this point in time I have no
clue the what/how of how we got here and I cannot reproduce.
Maybe by adding more useful information here I can figure out what is
going on.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com.
---

diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
index 7586718cd4..a6a910a1db 100644
--- a/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@ -561,7 +561,9 @@ static int wakeup_init(struct thread *t_wakeup)
 static void restart_done(struct daemon *dmn)
 {
 	if (dmn->state != DAEMON_DOWN) {
-		zlog_warn("wtf?");
+		zlog_warn(
+			"Daemon: %s: is in %s state but expected it to be in DAEMON_DOWN state",
+			dmn->name, state_str[dmn->state]);
 		return;
 	}
 	if (dmn->t_wakeup)