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

Merge pull request #6467 from qlyoung/fix-bgp-logrotation

Browse Source 
bgpd: avoid spamming bgp_accept() on bad vrf sock
This commit is contained in:
Donatas Abraitis 2020-06-01 08:46:26 +03:00 committed by GitHub
commit 1f0628c7d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bgpd/bgp_network.c
View File

@ -360,10 +360,13 @@ static int bgp_accept(struct thread *thread)
sockunion_init(&su); sockunion_init(&su);
bgp = bgp_lookup_by_name(listener->name);
/* Register accept thread. */ /* Register accept thread. */
accept_sock = THREAD_FD(thread); accept_sock = THREAD_FD(thread);
if (accept_sock < 0) { if (accept_sock < 0) {
flog_err_sys(EC_LIB_SOCKET, "accept_sock is negative value %d", flog_err_sys(EC_LIB_SOCKET,
"[Error] BGP accept socket fd is negative: %d",
accept_sock); accept_sock);
return -1; return -1;
} }
@ -374,10 +377,37 @@ static int bgp_accept(struct thread *thread)
/* Accept client connection. */ /* Accept client connection. */
bgp_sock = sockunion_accept(accept_sock, &su); bgp_sock = sockunion_accept(accept_sock, &su);
int save_errno = errno;
if (bgp_sock < 0) { if (bgp_sock < 0) {
flog_err_sys(EC_LIB_SOCKET, if (save_errno == EINVAL) {
"[Error] BGP socket accept failed (%s)", struct vrf *vrf =
safe_strerror(errno)); bgp ? vrf_lookup_by_id(bgp->vrf_id) : NULL;
/*
* It appears that sometimes, when VRFs are deleted on
* the system, it takes a little while for us to get
* notified about that. In the meantime we endlessly
* loop on accept(), because the socket, having been
* bound to a now-deleted VRF device, is in some weird
* state which causes accept() to fail.
*
* To avoid this, if we see accept() fail with EINVAL,
* we cancel ourselves and trust that when the VRF
* deletion notification comes in the event handler for
* that will take care of cleaning us up.
*/
flog_err_sys(
EC_LIB_SOCKET,
"[Error] accept() failed with error \"%s\" on BGP listener socket %d for BGP instance in VRF \"%s\"; refreshing socket",
safe_strerror(save_errno), accept_sock,
VRF_LOGNAME(vrf));
THREAD_OFF(listener->thread);
} else {
flog_err_sys(
EC_LIB_SOCKET,
"[Error] BGP socket accept failed (%s); retrying",
safe_strerror(save_errno));
}
return -1; return -1;
} }
set_nonblocking(bgp_sock); set_nonblocking(bgp_sock);
@ -888,7 +918,7 @@ void bgp_close_vrf_socket(struct bgp *bgp)
for (ALL_LIST_ELEMENTS(bm->listen_sockets, node, next, listener)) { for (ALL_LIST_ELEMENTS(bm->listen_sockets, node, next, listener)) {
if (listener->bgp == bgp) { if (listener->bgp == bgp) {
thread_cancel(listener->thread); THREAD_OFF(listener->thread);
close(listener->fd); close(listener->fd);
listnode_delete(bm->listen_sockets, listener); listnode_delete(bm->listen_sockets, listener);
XFREE(MTYPE_BGP_LISTENER, listener->name); XFREE(MTYPE_BGP_LISTENER, listener->name);