Skip to content

Commit

Permalink
[frr] remove frr rsyslog file outchannel (#5962)
Browse files Browse the repository at this point in the history
- Why I did it
frr is creating /var/log/frr/frr.log inside the frr docker and letting it grow. It will eventually exhaust hard drive space.

To fixe issue #5965

- How I did it
Remove rsyslog file outchannel so that frr won't generate /var/log/frr/frr.log inside the docker.

- How to verify it
Manually removed the outchannel and restart BGP docker, making sure that /var/log/frr/frr.log is no longer created inside the docker.

While restarting bgp docker, observed that base image /var/log/quagga/bgpd.log continued to grow and captured all FRR logs.
  • Loading branch information
yxieca authored Nov 21, 2020
1 parent 3b27afe commit d3c1a5b
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 1f150992b074d07bce5157d203319512a3aeb4dc Mon Sep 17 00:00:00 2001
From: Ying Xie <[email protected]>
Date: Wed, 18 Nov 2020 19:24:51 +0000
Subject: [PATCH] [frr] remove frr log outchannel to /var/log/frr.log

SONiC runs frr inside a docker and the logs are sent to base image
via rsyslog and recorded already. There is no need to keep the
frr.log inside the docker. It will grow and take all harddrive
space eventually.

Signed-off-by: Ying Xie <[email protected]>
---
tools/etc/rsyslog.d/45-frr.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/etc/rsyslog.d/45-frr.conf b/tools/etc/rsyslog.d/45-frr.conf
index ff7cd4831..af3c2c109 100644
--- a/tools/etc/rsyslog.d/45-frr.conf
+++ b/tools/etc/rsyslog.d/45-frr.conf
@@ -2,7 +2,7 @@
# to /var/log/frr/frr.log, then drops the message so it does
# not also go to /var/log/syslog, so the messages are not duplicated

-$outchannel frr_log,/var/log/frr/frr.log
+$outchannel frr_log
if $programname == 'babeld' or
$programname == 'bgpd' or
$programname == 'eigrpd' or
--
2.17.1

1 change: 1 addition & 0 deletions src/sonic-frr/patch/series
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch
0005-nexthops-compare-vrf-only-if-ip-type.patch
0006-changes-for-making-snmp-socket-non-blocking.patch
0007-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch

0 comments on commit d3c1a5b

Please sign in to comment.