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

Revert "bgpd: flock() dump files (BZ#742)"

Browse Source 
This reverts commit b07458a055.

On second thought, the right way to do this is with rename(), not by
introducing a lock that can potentially even stall bgpd.

Reported-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2013-01-16 01:28:36 +01:00
parent ca3ccd8748
commit a6694fe8a8
1 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bgpd/bgp_dump.c
View File

@ -95,7 +95,6 @@ static FILE *
bgp_dump_open_file (struct bgp_dump *bgp_dump) bgp_dump_open_file (struct bgp_dump *bgp_dump)
{ {
int ret; int ret;
int fd;
time_t clock; time_t clock;
struct tm *tm; struct tm *tm;
char fullpath[MAXPATHLEN]; char fullpath[MAXPATHLEN];
@ -132,16 +131,6 @@ bgp_dump_open_file (struct bgp_dump *bgp_dump)
umask(oldumask); umask(oldumask);
return NULL; return NULL;
} }
else
{
fd = fileno(bgp_dump->fp);
ret = flock( fd, LOCK_EX );
if (ret != 0)
{
zlog_warn ("bgp_dump_open_file: Unable to flock() file %s: %s", realpath, strerror (errno));
}
}
umask(oldumask); umask(oldumask);
return bgp_dump->fp; return bgp_dump->fp;
@ -206,7 +195,6 @@ bgp_dump_set_size (struct stream *s, int type)
static void static void
bgp_dump_routes_index_table(struct bgp *bgp) bgp_dump_routes_index_table(struct bgp *bgp)
{ {
int ret;
struct peer *peer; struct peer *peer;
struct listnode *node; struct listnode *node;
uint16_t peerno = 0; uint16_t peerno = 0;
@ -278,11 +266,7 @@ bgp_dump_routes_index_table(struct bgp *bgp)
bgp_dump_set_size(obuf, MSG_TABLE_DUMP_V2); bgp_dump_set_size(obuf, MSG_TABLE_DUMP_V2);
ret = fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_routes.fp); fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_routes.fp);
if (ret != 1)
{
zlog_warn ("bgp_dump_routes_index_table: fwrite returned %d, expected 1: %s", ret, strerror (errno));
}
fflush (bgp_dump_routes.fp); fflush (bgp_dump_routes.fp);
} }
@ -291,7 +275,6 @@ bgp_dump_routes_index_table(struct bgp *bgp)
static unsigned int static unsigned int
bgp_dump_routes_func (int afi, int first_run, unsigned int seq) bgp_dump_routes_func (int afi, int first_run, unsigned int seq)
{ {
int ret;
struct stream *obuf; struct stream *obuf;
struct bgp_info *info; struct bgp_info *info;
struct bgp_node *rn; struct bgp_node *rn;
@ -390,11 +373,8 @@ bgp_dump_routes_func (int afi, int first_run, unsigned int seq)
seq++; seq++;
bgp_dump_set_size(obuf, MSG_TABLE_DUMP_V2); bgp_dump_set_size(obuf, MSG_TABLE_DUMP_V2);
ret = fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_routes.fp); fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_routes.fp);
if (ret != 1)
{
zlog_warn ("bgp_dump_routes_func: fwrite returned %d, expected 1: %s", ret, strerror (errno));
}
} }
fflush (bgp_dump_routes.fp); fflush (bgp_dump_routes.fp);
@ -484,7 +464,6 @@ bgp_dump_common (struct stream *obuf, struct peer *peer, int forceas4)
void void
bgp_dump_state (struct peer *peer, int status_old, int status_new) bgp_dump_state (struct peer *peer, int status_old, int status_new)
{ {
int ret;
struct stream *obuf; struct stream *obuf;
/* If dump file pointer is disabled return immediately. */ /* If dump file pointer is disabled return immediately. */
@ -505,11 +484,7 @@ bgp_dump_state (struct peer *peer, int status_old, int status_new)
bgp_dump_set_size (obuf, MSG_PROTOCOL_BGP4MP); bgp_dump_set_size (obuf, MSG_PROTOCOL_BGP4MP);
/* Write to the stream. */ /* Write to the stream. */
ret = fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_all.fp); fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_all.fp);
if (ret != 1)
{
zlog_warn ("bgp_dump_state: fwrite returned %d, expected 1: %s", ret, strerror (errno));
}
fflush (bgp_dump_all.fp); fflush (bgp_dump_all.fp);
} }
@ -517,7 +492,6 @@ static void
bgp_dump_packet_func (struct bgp_dump *bgp_dump, struct peer *peer, bgp_dump_packet_func (struct bgp_dump *bgp_dump, struct peer *peer,
struct stream *packet) struct stream *packet)
{ {
int ret;
struct stream *obuf; struct stream *obuf;
/* If dump file pointer is disabled return immediately. */ /* If dump file pointer is disabled return immediately. */
@ -546,11 +520,7 @@ bgp_dump_packet_func (struct bgp_dump *bgp_dump, struct peer *peer,
bgp_dump_set_size (obuf, MSG_PROTOCOL_BGP4MP); bgp_dump_set_size (obuf, MSG_PROTOCOL_BGP4MP);
/* Write to the stream. */ /* Write to the stream. */
ret = fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump->fp); fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump->fp);
if (ret != 1)
{
zlog_warn ("bgp_dump_packet_func: fwrite returned %d, expected 1: %s", ret, strerror (errno));
}
fflush (bgp_dump->fp); fflush (bgp_dump->fp);
} }