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

bgpd: Implement connect retry backoff

Browse Source 
Instead of starting with a fairly high value of retry, let's try with a lower
and increase with a backoff to reach what was a default value (120s).

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2024-12-05 10:49:52 +02:00
parent 44f4a8ec40
commit ab3535fbcf
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bgpd/bgp_fsm.c
View File

@ -491,11 +491,14 @@ static void bgp_connect_timer(struct event *thread)
assert(!connection->t_read); assert(!connection->t_read);
if (bgp_debug_neighbor_events(peer)) if (bgp_debug_neighbor_events(peer))
zlog_debug("%s [FSM] Timer (connect timer expire)", peer->host); zlog_debug("%s [FSM] Timer (connect timer (%us) expire)", peer->host,
peer->v_connect);
if (CHECK_FLAG(peer->sflags, PEER_STATUS_ACCEPT_PEER)) if (CHECK_FLAG(peer->sflags, PEER_STATUS_ACCEPT_PEER))
bgp_stop(connection); bgp_stop(connection);
else { else {
if (!peer->connect)
peer->v_connect = MIN(BGP_MAX_CONNECT_RETRY, peer->v_connect * 2);
EVENT_VAL(thread) = ConnectRetry_timer_expired; EVENT_VAL(thread) = ConnectRetry_timer_expired;
bgp_event(thread); /* bgp_event unlocks peer */ bgp_event(thread); /* bgp_event unlocks peer */
} }
@ -1224,9 +1227,14 @@ void bgp_fsm_change_status(struct peer_connection *connection,
peer_count = bgp->established_peers; peer_count = bgp->established_peers;
if (status == Established) if (status == Established) {
bgp->established_peers++; bgp->established_peers++;
else if ((peer_established(connection)) && (status != Established)) /* Reset the retry timer if we already established */
if (peer->connect)
peer->v_connect = peer->connect;
else
peer->v_connect = peer->bgp->default_connect_retry;
} else if ((peer_established(connection)) && (status != Established))
bgp->established_peers--; bgp->established_peers--;
if (bgp_debug_neighbor_events(peer)) { if (bgp_debug_neighbor_events(peer)) {

1
bgpd/bgpd.h
View File

@ -2106,6 +2106,7 @@ struct bgp_nlri {
#define BGP_DEFAULT_HOLDTIME 180 #define BGP_DEFAULT_HOLDTIME 180
#define BGP_DEFAULT_KEEPALIVE 60 #define BGP_DEFAULT_KEEPALIVE 60
#define BGP_DEFAULT_CONNECT_RETRY 30 #define BGP_DEFAULT_CONNECT_RETRY 30
#define BGP_MAX_CONNECT_RETRY 120
#define BGP_DEFAULT_EBGP_ROUTEADV 0 #define BGP_DEFAULT_EBGP_ROUTEADV 0
#define BGP_DEFAULT_IBGP_ROUTEADV 0 #define BGP_DEFAULT_IBGP_ROUTEADV 0