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

lib: Partial Revert of 4ecc09d and modify zclient connect behavior

Browse Source 
Commit 43cc09d has been shown to cause several issues with clients
connecting.

Partial revert, since I wanted to keep the debug logs added
for that commit, as well remove the piece of code that
stops attempting to connect to zebra.  If we've failed
a bunch of times, there is nothing wrong with continuing
to do so once every 60 seconds.  I've debug guarded
the connect failure for those people running bgp
without zebra.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Donald Sharp 2016-12-12 07:59:16 -05:00 committed by Lou Berger
parent 7bae2fb913
commit ff9eb96a93
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/zclient.c
View File

@ -216,7 +216,9 @@ zclient_socket(void)
ret = connect (sock, (struct sockaddr *) &serv, sizeof (serv)); ret = connect (sock, (struct sockaddr *) &serv, sizeof (serv));
if (ret < 0) if (ret < 0)
{ {
zlog_warn ("%s connect failure: %d", __PRETTY_FUNCTION__, errno); if (zclient_debug)
zlog_warn ("%s connect failure: %d(%s)", __PRETTY_FUNCTION__,
errno, safe_strerror (errno));
close (sock); close (sock);
return -1; return -1;
} }
@ -252,7 +254,9 @@ zclient_socket_un (const char *path)
ret = connect (sock, (struct sockaddr *) &addr, len); ret = connect (sock, (struct sockaddr *) &addr, len);
if (ret < 0) if (ret < 0)
{ {
zlog_warn ("%s connect failure: %d", __PRETTY_FUNCTION__, errno); if (zclient_debug)
zlog_warn ("%s connect failure: %d(%s)", __PRETTY_FUNCTION__,
errno, safe_strerror (errno));
close (sock); close (sock);
return -1; return -1;
} }
@ -572,23 +576,11 @@ zclient_start (struct zclient *zclient)
if (zclient->t_connect) if (zclient->t_connect)
return 0; return 0;
/* if (zclient_socket_connect(zclient) < 0)
* If we fail to connect to the socket on initialization,
* Let's wait a second and see if we can reconnect.
* Cause if we don't connect, we never attempt to
* reconnect. On startup if zebra is slow we
* can get into this situation.
*/
while (zclient_socket_connect(zclient) < 0 && zclient->fail < 5)
{ {
if (zclient_debug) if (zclient_debug)
zlog_debug ("zclient connection fail"); zlog_debug ("zclient connection fail");
zclient->fail++; zclient->fail++;
sleep (1);
}
if (zclient->sock < 0)
{
zclient_event (ZCLIENT_CONNECT, zclient); zclient_event (ZCLIENT_CONNECT, zclient);
return -1; return -1;
} }
@ -1727,11 +1719,9 @@ zclient_event (enum event event, struct zclient *zclient)
thread_add_event (zclient->master, zclient_connect, zclient, 0); thread_add_event (zclient->master, zclient_connect, zclient, 0);
break; break;
case ZCLIENT_CONNECT: case ZCLIENT_CONNECT:
if (zclient->fail >= 10)
return;
if (zclient_debug) if (zclient_debug)
zlog_debug ("zclient connect schedule interval is %d", zlog_debug ("zclient connect failures: %d schedule interval is now %d",
zclient->fail < 3 ? 10 : 60); zclient->fail, zclient->fail < 3 ? 10 : 60);
if (! zclient->t_connect) if (! zclient->t_connect)
zclient->t_connect = zclient->t_connect =
thread_add_timer (zclient->master, zclient_connect, zclient, thread_add_timer (zclient->master, zclient_connect, zclient,