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

Merge pull request #17599 from opensourcerouting/fix/reduce_default_connect_timer

Browse Source 
bgpd: Connect retry timer backoff
This commit is contained in:
Jafar Al-Gharaibeh 2024-12-18 16:26:37 -06:00 committed by GitHub
commit f78b1786a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 8 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)) {

6
bgpd/bgp_vty.c
View File

@ -95,15 +95,15 @@ FRR_CFG_DEFAULT_BOOL(BGP_DETERMINISTIC_MED,
); );
FRR_CFG_DEFAULT_ULONG(BGP_CONNECT_RETRY, FRR_CFG_DEFAULT_ULONG(BGP_CONNECT_RETRY,
{ .val_ulong = 10, .match_profile = "datacenter", }, { .val_ulong = 10, .match_profile = "datacenter", },
{ .val_ulong = 120 }, { .val_ulong = BGP_DEFAULT_CONNECT_RETRY },
); );
FRR_CFG_DEFAULT_ULONG(BGP_HOLDTIME, FRR_CFG_DEFAULT_ULONG(BGP_HOLDTIME,
{ .val_ulong = 9, .match_profile = "datacenter", }, { .val_ulong = 9, .match_profile = "datacenter", },
{ .val_ulong = 180 }, { .val_ulong = BGP_DEFAULT_KEEPALIVE },
); );
FRR_CFG_DEFAULT_ULONG(BGP_KEEPALIVE, FRR_CFG_DEFAULT_ULONG(BGP_KEEPALIVE,
{ .val_ulong = 3, .match_profile = "datacenter", }, { .val_ulong = 3, .match_profile = "datacenter", },
{ .val_ulong = 60 }, { .val_ulong = BGP_DEFAULT_KEEPALIVE },
); );
FRR_CFG_DEFAULT_BOOL(BGP_EBGP_REQUIRES_POLICY, FRR_CFG_DEFAULT_BOOL(BGP_EBGP_REQUIRES_POLICY,
{ .val_bool = false, .match_profile = "datacenter", }, { .val_bool = false, .match_profile = "datacenter", },

3
bgpd/bgpd.h
View File

@ -2121,7 +2121,8 @@ 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 120 #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

2
tests/topotests/bgp_minimum_holdtime/test_bgp_minimum_holdtime.py
View File

@ -76,7 +76,7 @@ def test_bgp_minimum_holdtime():
return topotest.json_cmp(output, expected) return topotest.json_cmp(output, expected)
test_func = functools.partial(_bgp_neighbor_check_if_notification_sent) test_func = functools.partial(_bgp_neighbor_check_if_notification_sent)
_, result = topotest.run_and_expect(test_func, None, count=40, wait=0.5) _, result = topotest.run_and_expect(test_func, None, count=30, wait=1)
assert result is None, "Failed to send notification message\n" assert result is None, "Failed to send notification message\n"