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

Merge pull request #12259 from opensourcerouting/fix/show_rtt_always

Browse Source 
bgpd: Shutdown RTT improvements
This commit is contained in:
Donald Sharp 2022-11-16 10:28:23 -05:00 committed by GitHub
commit b36156760b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bgpd/bgp_fsm.c
View File

@ -634,7 +634,8 @@ const char *const peer_down_str[] = {"",
"AS Set config change", "AS Set config change",
"Waiting for peer OPEN", "Waiting for peer OPEN",
"Reached received prefix count", "Reached received prefix count",
"Socket Error"}; "Socket Error",
"Admin. shutdown (RTT)"};
static void bgp_graceful_restart_timer_off(struct peer *peer) static void bgp_graceful_restart_timer_off(struct peer *peer)
{ {
@ -1832,7 +1833,9 @@ int bgp_start(struct peer *peer)
flog_err(EC_BGP_FSM, flog_err(EC_BGP_FSM,
"%s [FSM] Trying to start suppressed peer - this is never supposed to happen!", "%s [FSM] Trying to start suppressed peer - this is never supposed to happen!",
peer->host); peer->host);
if (CHECK_FLAG(peer->flags, PEER_FLAG_SHUTDOWN)) if (CHECK_FLAG(peer->sflags, PEER_STATUS_RTT_SHUTDOWN))
peer->last_reset = PEER_DOWN_RTT_SHUTDOWN;
else if (CHECK_FLAG(peer->flags, PEER_FLAG_SHUTDOWN))
peer->last_reset = PEER_DOWN_USER_SHUTDOWN; peer->last_reset = PEER_DOWN_USER_SHUTDOWN;
else if (CHECK_FLAG(peer->bgp->flags, BGP_FLAG_SHUTDOWN)) else if (CHECK_FLAG(peer->bgp->flags, BGP_FLAG_SHUTDOWN))
peer->last_reset = PEER_DOWN_USER_SHUTDOWN; peer->last_reset = PEER_DOWN_USER_SHUTDOWN;

26
bgpd/bgp_packet.c
View File

@ -1011,9 +1011,12 @@ static void bgp_notify_send_internal(struct peer *peer, uint8_t code,
if (code == BGP_NOTIFY_CEASE) { if (code == BGP_NOTIFY_CEASE) {
if (sub_code == BGP_NOTIFY_CEASE_ADMIN_RESET) if (sub_code == BGP_NOTIFY_CEASE_ADMIN_RESET)
peer->last_reset = PEER_DOWN_USER_RESET; peer->last_reset = PEER_DOWN_USER_RESET;
else if (sub_code == BGP_NOTIFY_CEASE_ADMIN_SHUTDOWN) else if (sub_code == BGP_NOTIFY_CEASE_ADMIN_SHUTDOWN) {
peer->last_reset = PEER_DOWN_USER_SHUTDOWN; if (CHECK_FLAG(peer->sflags, PEER_STATUS_RTT_SHUTDOWN))
peer->last_reset = PEER_DOWN_RTT_SHUTDOWN;
else else
peer->last_reset = PEER_DOWN_USER_SHUTDOWN;
} else
peer->last_reset = PEER_DOWN_NOTIFY_SEND; peer->last_reset = PEER_DOWN_NOTIFY_SEND;
} else } else
peer->last_reset = PEER_DOWN_NOTIFY_SEND; peer->last_reset = PEER_DOWN_NOTIFY_SEND;
@ -1749,15 +1752,24 @@ static int bgp_keepalive_receive(struct peer *peer, bgp_size_t size)
/* If the peer's RTT is higher than expected, shutdown /* If the peer's RTT is higher than expected, shutdown
* the peer automatically. * the peer automatically.
*/ */
if (CHECK_FLAG(peer->flags, PEER_FLAG_RTT_SHUTDOWN) if (!CHECK_FLAG(peer->flags, PEER_FLAG_RTT_SHUTDOWN))
&& peer->rtt > peer->rtt_expected) { return Receive_KEEPALIVE_message;
if (peer->rtt > peer->rtt_expected) {
peer->rtt_keepalive_rcv++; peer->rtt_keepalive_rcv++;
if (peer->rtt_keepalive_rcv > peer->rtt_keepalive_conf) { if (peer->rtt_keepalive_rcv > peer->rtt_keepalive_conf) {
zlog_warn( char rtt_shutdown_reason[BUFSIZ] = {};
"%s shutdown due to high round-trip-time (%dms > %dms)",
peer->host, peer->rtt, peer->rtt_expected); snprintfrr(
rtt_shutdown_reason,
sizeof(rtt_shutdown_reason),
"shutdown due to high round-trip-time (%dms > %dms, hit %u times)",
peer->rtt, peer->rtt_expected,
peer->rtt_keepalive_rcv);
zlog_warn("%s %s", peer->host, rtt_shutdown_reason);
SET_FLAG(peer->sflags, PEER_STATUS_RTT_SHUTDOWN);
peer_tx_shutdown_message_set(peer, rtt_shutdown_reason);
peer_flag_set(peer, PEER_FLAG_SHUTDOWN); peer_flag_set(peer, PEER_FLAG_SHUTDOWN);
} }
} else { } else {

22
bgpd/bgp_vty.c
View File

@ -5272,8 +5272,10 @@ static int peer_flag_modify_vty(struct vty *vty, const char *ip_str,
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
if (!set && flag == PEER_FLAG_SHUTDOWN) if (!set && flag == PEER_FLAG_SHUTDOWN) {
peer_tx_shutdown_message_unset(peer); peer_tx_shutdown_message_unset(peer);
UNSET_FLAG(peer->sflags, PEER_STATUS_RTT_SHUTDOWN);
}
if (set) if (set)
ret = peer_flag_set(peer, flag); ret = peer_flag_set(peer, flag);
@ -14565,9 +14567,18 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
if (use_json) { if (use_json) {
json_object_int_add(json_neigh, "connectRetryTimer", json_object_int_add(json_neigh, "connectRetryTimer",
p->v_connect); p->v_connect);
if (peer_established(p) && p->rtt) if (peer_established(p)) {
json_object_int_add(json_neigh, "estimatedRttInMsecs", json_object_int_add(json_neigh, "estimatedRttInMsecs",
p->rtt); p->rtt);
if (CHECK_FLAG(p->flags, PEER_FLAG_RTT_SHUTDOWN)) {
json_object_int_add(json_neigh,
"shutdownRttInMsecs",
p->rtt_expected);
json_object_int_add(json_neigh,
"shutdownRttAfterCount",
p->rtt_keepalive_rcv);
}
}
if (p->t_start) if (p->t_start)
json_object_int_add( json_object_int_add(
json_neigh, "nextStartTimerDueInMsecs", json_neigh, "nextStartTimerDueInMsecs",
@ -14602,9 +14613,14 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
} else { } else {
vty_out(vty, "BGP Connect Retry Timer in Seconds: %d\n", vty_out(vty, "BGP Connect Retry Timer in Seconds: %d\n",
p->v_connect); p->v_connect);
if (peer_established(p) && p->rtt) if (peer_established(p)) {
vty_out(vty, "Estimated round trip time: %d ms\n", vty_out(vty, "Estimated round trip time: %d ms\n",
p->rtt); p->rtt);
if (CHECK_FLAG(p->flags, PEER_FLAG_RTT_SHUTDOWN))
vty_out(vty,
"Shutdown when RTT > %dms, count > %u\n",
p->rtt_expected, p->rtt_keepalive_rcv);
}
if (p->t_start) if (p->t_start)
vty_out(vty, "Next start timer due in %ld seconds\n", vty_out(vty, "Next start timer due in %ld seconds\n",
thread_timer_remain_second(p->t_start)); thread_timer_remain_second(p->t_start));

2
bgpd/bgpd.h
View File

@ -1524,6 +1524,7 @@ struct peer {
/* LLGR aware peer */ /* LLGR aware peer */
#define PEER_STATUS_LLGR_WAIT (1U << 11) #define PEER_STATUS_LLGR_WAIT (1U << 11)
#define PEER_STATUS_REFRESH_PENDING (1U << 12) /* refresh request from peer */ #define PEER_STATUS_REFRESH_PENDING (1U << 12) /* refresh request from peer */
#define PEER_STATUS_RTT_SHUTDOWN (1U << 13) /* In shutdown state due to RTT */
/* Configured timer values. */ /* Configured timer values. */
_Atomic uint32_t holdtime; _Atomic uint32_t holdtime;
@ -1737,6 +1738,7 @@ struct peer {
#define PEER_DOWN_WAITING_OPEN 32U /* Waiting for open to succeed */ #define PEER_DOWN_WAITING_OPEN 32U /* Waiting for open to succeed */
#define PEER_DOWN_PFX_COUNT 33U /* Reached received prefix count */ #define PEER_DOWN_PFX_COUNT 33U /* Reached received prefix count */
#define PEER_DOWN_SOCKET_ERROR 34U /* Some socket error happened */ #define PEER_DOWN_SOCKET_ERROR 34U /* Some socket error happened */
#define PEER_DOWN_RTT_SHUTDOWN 35U /* Automatically shutdown due to RTT */
/* /*
* Remember to update peer_down_str in bgp_fsm.c when you add * Remember to update peer_down_str in bgp_fsm.c when you add
* a new value to the last_reset reason * a new value to the last_reset reason