proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 11:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Give a bit more data about zclient connection on errors

Browse Source 
When debugging a crash I noticed that sometimes we talked about
a zclient connection in relation to the fd associated with it
and sometimes we did not.  Let's just always give the data
associated with the fd.  It will make it a bit easier for me
to follow the transitions.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-12-13 11:21:26 -05:00
parent f7720ab68f
commit 3a53b2dc4f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zebra/zserv.c
View File

@ -184,10 +184,9 @@ void zserv_log_message(const char *errmsg, struct stream *msg,
*/ */
static void zserv_client_fail(struct zserv *client) static void zserv_client_fail(struct zserv *client)
{ {
flog_warn( flog_warn(EC_ZEBRA_CLIENT_IO_ERROR,
EC_ZEBRA_CLIENT_IO_ERROR, "Client %d '%s' (session id %d) encountered an error and is shutting down.",
"Client '%s' (session id %d) encountered an error and is shutting down.", client->sock, zebra_route_string(client->proto), client->session_id);
zebra_route_string(client->proto), client->session_id);
atomic_store_explicit(&client->pthread->running, false, atomic_store_explicit(&client->pthread->running, false,
memory_order_relaxed); memory_order_relaxed);
@ -468,8 +467,8 @@ static void zserv_read(struct event *thread)
} }
if (IS_ZEBRA_DEBUG_PACKET) if (IS_ZEBRA_DEBUG_PACKET)
zlog_debug("Read %d packets from client: %s. Current ibuf fifo count: %zu. Conf P2p %d", zlog_debug("Read %d packets from client: %s(%d). Current ibuf fifo count: %zu. Conf P2p %d",
p2p_avail - p2p, zebra_route_string(client->proto), p2p_avail - p2p, zebra_route_string(client->proto), client->sock,
client_ibuf_fifo_cnt, p2p_orig); client_ibuf_fifo_cnt, p2p_orig);
/* Reschedule ourselves since we have space in ibuf_fifo */ /* Reschedule ourselves since we have space in ibuf_fifo */