Merge pull request #12345 from donaldsharp/bgp_debugs_upstream

Bgp debugs upstream
This commit is contained in:
Donatas Abraitis 2022-11-21 10:01:10 +02:00 committed by GitHub
commit 575d82a213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 9 deletions

View File

@ -1335,7 +1335,7 @@ void bgp_fsm_change_status(struct peer *peer, int status)
bgp_peer_update_orr_active_roots(peer); bgp_peer_update_orr_active_roots(peer);
if (bgp_debug_neighbor_events(peer)) if (bgp_debug_neighbor_events(peer))
zlog_debug("%s went from %s to %s", peer->host, zlog_debug("%s fd %d went from %s to %s", peer->host, peer->fd,
lookup_msg(bgp_status_msg, peer->ostatus, NULL), lookup_msg(bgp_status_msg, peer->ostatus, NULL),
lookup_msg(bgp_status_msg, peer->status, NULL)); lookup_msg(bgp_status_msg, peer->status, NULL));
} }

View File

@ -115,7 +115,7 @@ static void peer_process(struct hash_bucket *hb, void *arg)
elapsed.tv_sec >= ka.tv_sec || timercmp(&diff, &tolerance, <); elapsed.tv_sec >= ka.tv_sec || timercmp(&diff, &tolerance, <);
if (send_keepalive) { if (send_keepalive) {
if (bgp_debug_neighbor_events(pkat->peer)) if (bgp_debug_keepalive(pkat->peer))
zlog_debug("%s [FSM] Timer (keepalive timer expire)", zlog_debug("%s [FSM] Timer (keepalive timer expire)",
pkat->peer->host); pkat->peer->host);

View File

@ -530,8 +530,10 @@ static void bgp_accept(struct thread *thread)
} }
if (bgp_debug_neighbor_events(peer1)) if (bgp_debug_neighbor_events(peer1))
zlog_debug("[Event] BGP connection from host %s fd %d", zlog_debug(
inet_sutop(&su, buf), bgp_sock); "[Event] connection from %s fd %d, active peer status %d fd %d",
inet_sutop(&su, buf), bgp_sock, peer1->status,
peer1->fd);
if (peer1->doppelganger) { if (peer1->doppelganger) {
/* We have an existing connection. Kill the existing one and run /* We have an existing connection. Kill the existing one and run

View File

@ -2653,12 +2653,7 @@ static void bgp_route_select_timer_expire(struct thread *thread)
safi = info->safi; safi = info->safi;
bgp = info->bgp; bgp = info->bgp;
if (BGP_DEBUG(update, UPDATE_OUT))
zlog_debug("afi %d, safi %d : route select timer expired", afi,
safi);
bgp->gr_info[afi][safi].t_route_select = NULL; bgp->gr_info[afi][safi].t_route_select = NULL;
XFREE(MTYPE_TMP, info); XFREE(MTYPE_TMP, info);
/* Best path selection */ /* Best path selection */