Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update daemons and daemons.conf for FRR 6.0.2 #2461

Merged
merged 1 commit into from
Jan 18, 2019
Merged

Update daemons and daemons.conf for FRR 6.0.2 #2461

merged 1 commit into from
Jan 18, 2019

Conversation

mslocrian
Copy link
Contributor

- What I did
FRR 6.0.2 changes the daemons and daemons.conf file. This is causing the bgp container to not come up nicely. There were issues w/ the args being passed to watchfrr.

- How I did it
I copied the daemons and daemons.conf from the frr repo to here.

- How to verify it
With original configuration:

root@sonic:/etc/sonic/frr# docker rm bgp
Error: No such container: bgp
root@sonic:/etc/sonic/frr# systemctl start bgp
docker eroot@sonic:/etc/sonic/frr# docker exec -t -i bgp bash
root@sonic:/# exit
root@sonic:/etc/sonic/frr#
root@sonic:/etc/sonic/frr#
root@sonic:/etc/sonic/frr# docker logs bgp
[ ok ] Starting enhanced syslogd: rsyslogd.
[warn] Reading deprecated /etc/frr/daemons.conf. Please move its settings to /etc/frr/daemons and remove it. ... (warning).
/etc/init.d/frr: 23: /etc/frr/daemons.conf: Syntax error: "(" unexpected
root@sonic:/# Waiting for fpm-client connection...
root@sonic:/etc/sonic/frr# docker exec -t -i bgp bash
root@sonic:/# ps auxww
USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
root         1  0.3  0.0   4336   720 pts/0    Ss   04:50   0:00 /bin/sh -c /usr/bin/config.sh           && /usr/bin/start.sh            && /bin/bash
root        34  4.5  0.0 250168  2528 ?        Ssl  04:50   0:00 /usr/sbin/rsyslogd
root        83  0.0  0.0 100852  3336 pts/0    Sl   04:50   0:00 fpmsyncd
root        84  0.0  0.0  20244  3124 pts/0    S+   04:50   0:00 /bin/bash
root        91  4.0  0.0  20244  3116 pts/1    Ss   04:50   0:00 bash
root        97  0.0  0.0  17504  2180 pts/1    R+   04:50   0:00 ps auxww
root@sonic:/# ps auxww
USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
root         1  0.2  0.0   4336   720 pts/0    Ss   04:50   0:00 /bin/sh -c /usr/bin/config.sh           && /usr/bin/start.sh            && /bin/bash
root        34  4.0  0.0 250168  2528 ?        Ssl  04:50   0:00 /usr/sbin/rsyslogd
root        83  0.0  0.0 100852  3336 pts/0    Sl   04:50   0:00 fpmsyncd
root        84  0.0  0.0  20244  3124 pts/0    S+   04:50   0:00 /bin/bash
root        91  1.3  0.0  20244  3296 pts/1    Ss   04:50   0:00 bash
root        98  0.0  0.0  17504  2100 pts/1    R+   04:50   0:00 ps auxww
root@sonic:/# ps auxww
USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
root         1  0.2  0.0   4336   720 pts/0    Ss   04:50   0:00 /bin/sh -c /usr/bin/config.sh           && /usr/bin/start.sh            && /bin/bash
root        34  3.7  0.0 250168  2528 ?        Ssl  04:50   0:00 /usr/sbin/rsyslogd
root        83  0.0  0.0 100852  3336 pts/0    Sl   04:50   0:00 fpmsyncd
root        84  0.0  0.0  20244  3124 pts/0    S+   04:50   0:00 /bin/bash
root        91  1.0  0.0  20244  3296 pts/1    Ss   04:50   0:00 bash
root        99  0.0  0.0  17504  2088 pts/1    R+   04:50   0:00 ps auxww
root@sonic:/#

With proper daemons config:

root@sonic:/etc/sonic/frr# cp daemons.new  daemons
root@sonic:/etc/sonic/frr# cp daemons.conf.new daemons.conf
root@sonic:/etc/sonic/frr# systemctl stop bgp
docker rm bgp
systemc	start bgp^Uroot@sonic:/etc/sonic/frr# docker rm bgp
bgp
root@sonic:/etc/sonic/frr# systemctl start bgp
root@sonic:/etc/sonic/frr# docker logs bgp
[ ok ] Starting enhanced syslogd: rsyslogd.
root@sonic:/etc/sonic/frr# docker exec -t -i bgp bash
root@sonic:/# ps auxww
USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
root         1  0.7  0.0   4336   760 pts/0    Ss+  04:51   0:00 /bin/sh -c /usr/bin/config.sh           && /usr/bin/start.sh            && /bin/bash
root        22  0.0  0.0  20044  2880 pts/0    S+   04:51   0:00 /bin/bash /usr/bin/start.sh
root        34 10.6  0.0 250168  2556 ?        Ssl  04:51   0:00 /usr/sbin/rsyslogd
root        57  0.0  0.0   4336  1684 pts/0    S+   04:51   0:00 /bin/sh /etc/init.d/frr start
root        65  0.0  0.0  80096  3372 pts/0    S+   04:51   0:00 /usr/lib/frr/watchfrr -d -r /usr/lib/frr/watchfrr.sh restart %s -s /usr/lib/frr/watchfrr.sh start %s -k /usr/lib/frr/watchfrr.sh stop %s zebra bgpd staticd
root        66  0.0  0.0  80096  2484 ?        Ss   04:51   0:00 /usr/lib/frr/watchfrr -d -r /usr/lib/frr/watchfrr.sh restart %s -s /usr/lib/frr/watchfrr.sh start %s -k /usr/lib/frr/watchfrr.sh stop %s zebra bgpd staticd
frr         81  0.4  0.0 370152  5524 ?        Ssl  04:51   0:00 /usr/lib/frr/zebra -d -A 127.0.0.1 -s 90000000
frr         84  1.4  0.0 301448 10788 ?        Ssl  04:51   0:00 /usr/lib/frr/bgpd -d -A 127.0.0.1
root        94  4.0  0.0  20244  3120 pts/1    Ss   04:51   0:00 bash
root        99  0.0  0.0  17504  2056 pts/1    R+   04:51   0:00 ps auxww
root@sonic:/#

- Description for the changelog

Updated FRR daemons and daemons.conf to match FRR 6.0.2 release.

- A picture of a cute animal (not mandatory but encouraged)
Animal

@msftclas
Copy link

msftclas commented Jan 18, 2019

CLA assistant check
All CLA requirements met.

Signed-off-by: Stegen Smith <stegen@owns.com>
@lguohan lguohan merged commit 53685df into sonic-net:master Jan 18, 2019
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Sep 27, 2022
linkmgrd:
* a0834e4 2022-09-22 | [Active-Active] server side admin forwarding state sync up (sonic-net#133) (HEAD -> 202205) [Jing Zhang]
* ea56020 2022-09-21 | Post switchover reasons to STATE DB (sonic-net#131) [Jing Zhang]

swss:
* d9cbf44 2022-09-24 | [orchagent] Fix issue: ip prefix shall be inited even if VRF/VNET is not ready (sonic-net#2461) (HEAD -> 202205, github/202205) [Junchao-Mellanox]
* 3dcd6ff 2022-09-24 | [macsec]: Set MTU for MACsec (sonic-net#2398) (sonic-net#2466) [Ze Gan]

platform-daemon:
* 48b6239 2022-09-27 | [ycabled] add support for getting grpc secerts via shared file (sonic-net#298) (HEAD -> 202205) [vdahiya12]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
yxieca added a commit that referenced this pull request Sep 28, 2022
)

linkmgrd:
* a0834e4 2022-09-22 | [Active-Active] server side admin forwarding state sync up (#133) (HEAD -> 202205) [Jing Zhang]
* ea56020 2022-09-21 | Post switchover reasons to STATE DB (#131) [Jing Zhang]

swss:
* d9cbf44 2022-09-24 | [orchagent] Fix issue: ip prefix shall be inited even if VRF/VNET is not ready (#2461) (HEAD -> 202205, github/202205) [Junchao-Mellanox]
* 3dcd6ff 2022-09-24 | [macsec]: Set MTU for MACsec (#2398) (#2466) [Ze Gan]

platform-daemon:
* 48b6239 2022-09-27 | [ycabled] add support for getting grpc secerts via shared file (#298) (HEAD -> 202205) [vdahiya12]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
theasianpianist added a commit to theasianpianist/sonic-buildimage that referenced this pull request Oct 5, 2022
Include:

df92fb7 Improve verbosity level and provide more info in the log (sonic-net#2472)
e81ed20 [intfmgr]: Enable `accept_untracked_na` kernel param (sonic-net#2436)
24d29f1 [orchdaemon]: Fixed sairedis record file rotation (sonic-net#2299)
b8ee07d [build] add missing package libyang-dev in lgtm.yml (sonic-net#2475)
e46dd29 [crm] Fix issue with continues EXCEEDED and CLEAR logs for ACL group/table counters (sonic-net#2463)
b61d24c [doc]: Update README.md (sonic-net#2456)
b9ade5d [orchagent] Fix issue: ip prefix shall be inited even if VRF/VNET is not ready (sonic-net#2461)
f0f1eb4 Revert "[counters] Improve performance by polling only configured ports buffer queue/pg counters (sonic-net#2360)" (sonic-net#2458)
3d757a8 [ci][asan] add DVS tests run with ASAN (sonic-net#2441)
04fbc8e [ci] Only when test stage succeeded or succeededwithissues, PR run Gcov (sonic-net#2460)
7cc035f [orchagent]: Publish identified events via structured-events channel (sonic-net#2446)
efa0f01 [QoS] Enforce drop probability only for colors whose WRED are enabled (sonic-net#2422)
05c5c2f [swss] Replace memset functions (sonic-net#2423)
9ff993d Modified the test file to remove click commands and do the REDIS-DB u… (sonic-net#2264)
9e376af Install libyang in azure pipeline. (sonic-net#2445)
c1eb99a check state_db for po before sending ARP/ND pkts (sonic-net#2444)
43cc486 [portmgr] Fixed the orchagent crash due to late arrival of notif (sonic-net#2431)
b62c716 Enhance orchagent and buffer manager in error handling (sonic-net#2414)
13bda3c [Everflow/ERSPAN] Set correct destination port and mac address when the nexthop is updated for ERSPAN mirror destination (sonic-net#2392)
0ccb315 Revert "[VS Test] Skip failing subport tests (sonic-net#2370)" (sonic-net#2421)
ac8a83f [UT] [Portsyncd] Added Unit Tests for portsyncd (sonic-net#2297)
83a186a Change the log messages in addKernelNeigh/Route from ERROR to INFO (sonic-net#2437)
9c23389 [BFD]Clean up state_db BFD entries on swss restart (sonic-net#2434)
d41aebf EntityBulker SIGSEGV when create_entry attr_count 0 (sonic-net#2224)
f52a7b1 Fix the Fec Mode Setting of gbsyncd (sonic-net#2430)
8cc0a45 [neighsyncd] Enabling ipv4 link local entries for non-dualtor (sonic-net#2427)
5624e87 Revert "[ci][asan] add DVS tests run with ASAN (sonic-net#2363)" (sonic-net#2433)
a26b26a Dynamic port configuration - add port buffer cfg to the port ref counter (sonic-net#2194)
486939a tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE (sonic-net#2408)
a4b8992 [counters] Improve performance by polling only configured ports buffer queue/pg counters (sonic-net#2360)
4aaeec9 added support for Xsight platform (sonic-net#2426)
ca9edca [ci][asan] add DVS tests run with ASAN (sonic-net#2363)
dec4570 Handle dual ToR neighbor miss scenario (sonic-net#2151)
9eb4422 Upstream new development on p4orch (sonic-net#2237)
e9be2c0 [lgtm] Fix dependency (sonic-net#2419)
c0168f3 [muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive() (sonic-net#2415)
cfcf3d8 [macsec]: Set MTU for MACsec (sonic-net#2398)
8346034 Delete Invalid if condition in intfsorch.cpp (sonic-net#2411)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
theasianpianist added a commit that referenced this pull request Oct 7, 2022
Include:

df92fb7 Improve verbosity level and provide more info in the log (#2472)
e81ed20 [intfmgr]: Enable `accept_untracked_na` kernel param (#2436)
24d29f1 [orchdaemon]: Fixed sairedis record file rotation (#2299)
b8ee07d [build] add missing package libyang-dev in lgtm.yml (#2475)
e46dd29 [crm] Fix issue with continues EXCEEDED and CLEAR logs for ACL group/table counters (#2463)
b61d24c [doc]: Update README.md (#2456)
b9ade5d [orchagent] Fix issue: ip prefix shall be inited even if VRF/VNET is not ready (#2461)
f0f1eb4 Revert "[counters] Improve performance by polling only configured ports buffer queue/pg counters (#2360)" (#2458)
3d757a8 [ci][asan] add DVS tests run with ASAN (#2441)
04fbc8e [ci] Only when test stage succeeded or succeededwithissues, PR run Gcov (#2460)
7cc035f [orchagent]: Publish identified events via structured-events channel (#2446)
efa0f01 [QoS] Enforce drop probability only for colors whose WRED are enabled (#2422)
05c5c2f [swss] Replace memset functions (#2423)
9ff993d Modified the test file to remove click commands and do the REDIS-DB u… (#2264)
9e376af Install libyang in azure pipeline. (#2445)
c1eb99a check state_db for po before sending ARP/ND pkts (#2444)
43cc486 [portmgr] Fixed the orchagent crash due to late arrival of notif (#2431)
b62c716 Enhance orchagent and buffer manager in error handling (#2414)
13bda3c [Everflow/ERSPAN] Set correct destination port and mac address when the nexthop is updated for ERSPAN mirror destination (#2392)
0ccb315 Revert "[VS Test] Skip failing subport tests (#2370)" (#2421)
ac8a83f [UT] [Portsyncd] Added Unit Tests for portsyncd (#2297)
83a186a Change the log messages in addKernelNeigh/Route from ERROR to INFO (#2437)
9c23389 [BFD]Clean up state_db BFD entries on swss restart (#2434)
d41aebf EntityBulker SIGSEGV when create_entry attr_count 0 (#2224)
f52a7b1 Fix the Fec Mode Setting of gbsyncd (#2430)
8cc0a45 [neighsyncd] Enabling ipv4 link local entries for non-dualtor (#2427)
5624e87 Revert "[ci][asan] add DVS tests run with ASAN (#2363)" (#2433)
a26b26a Dynamic port configuration - add port buffer cfg to the port ref counter (#2194)
486939a tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE (#2408)
a4b8992 [counters] Improve performance by polling only configured ports buffer queue/pg counters (#2360)
4aaeec9 added support for Xsight platform (#2426)
ca9edca [ci][asan] add DVS tests run with ASAN (#2363)
dec4570 Handle dual ToR neighbor miss scenario (#2151)
9eb4422 Upstream new development on p4orch (#2237)
e9be2c0 [lgtm] Fix dependency (#2419)
c0168f3 [muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive() (#2415)
cfcf3d8 [macsec]: Set MTU for MACsec (#2398)
8346034 Delete Invalid if condition in intfsorch.cpp (#2411)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
theasianpianist added a commit to theasianpianist/sonic-buildimage that referenced this pull request Oct 27, 2022
Include following commit:
936f1b1 Revert "[config reload]: On dual ToR systems, cache ARP and FDB table… (sonic-net#2461)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
theasianpianist added a commit that referenced this pull request Oct 31, 2022
Include following commit:
936f1b1 Revert "[config reload]: On dual ToR systems, cache ARP and FDB table… (#2461)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
tshalvi pushed a commit to tshalvi/sonic-buildimage that referenced this pull request Dec 20, 2022
…not ready (sonic-net#2461)

*Flexcounter - Fix issue: ip prefix of a route flow pattern shall be initialized even if VRF/VNET is not ready
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants