[FRR]: Update frr to frr-7.0.1 #2899

pavel-shirshov · 2019-05-14T20:00:58Z

- What I did

Updated FRR to version FRR 7.0.1.
Enabled staticd, which controls static routes since FRR 6.x
Disabled installation of FRR-pythontools, which contains only one python tool, which makes semantic diffs of quagga configs, but requires python3 to run
Fixed some issues in Makefiles

- How I did it
Added necessary dependency + updated FRR repository

- How to verify it
Build an image and run it.

- Description for the changelog

Update FRR to FRR 7.0.1. staticd was enabled.

** - What must be completed until the PR is ready for merging: **

Convert all Debian related downloads to azure cloud related downloads [DONE]
Decide what to do with frr.conf vs bgpd.conf,zebra.conf,staticd.conf [DONE]
Update permissions for /etc/frr. Currently it's impossible for frr create a new file [DONE]

# wr mem
Note: this version of vtysh never writes vtysh.conf

Warning: attempting direct configuration write without watchfrr.
File permissions and ownership may be incorrect, or write may fail.

Building Configuration...
Warning: /etc/frr/frr.conf.sav unlink failed
Integrated configuration saved to /etc/frr/frr.conf
[OK]

lguohan · 2019-05-14T22:00:03Z

you need to modify the start.sh to start staticd

lguohan · 2019-05-14T22:01:04Z

both model are supported, if it is unified configuration model, then use frr.conf. if it is separated configuration model, then use zebra.conf, bgpd.conf, and staticd.conf.

lguohan · 2019-05-14T22:03:16Z

about FRR-pythontools, don't we have python3 installed in the frr docker?

src/python3/Makefile

qiluo-msft · 2019-05-14T22:49:55Z

After this PR #2807, python3 is only available in snmp docker image (3.6). What is the motivate of using FRR-pythontools? If really needed, I propose 2 options:

install python3.6 into docker-base image
install Debian vanilla python3.5.3-1 in Stretch docker-base.

In reply to: 492426979 [](ancestors = 492426979)

pavel-shirshov · 2019-05-14T23:06:10Z

you need to modify the start.sh to start staticd

I think I've it here: https://github.com/Azure/sonic-buildimage/pull/2899/files#diff-2faaa492fd949e4b9f384eb592a81bcbR35

pavel-shirshov · 2019-05-14T23:09:13Z

After this PR #2807, python3 is only available in snmp docker image (3.6). What is the motivate of using FRR-pythontools? If really needed, I propose 2 options:

install python3.6 into docker-base image
install Debian vanilla python3.5.3-1 in Stretch docker-base.

In reply to: 492426979 [](ancestors = 492426979)

I don't think we need frr-pythontools.
Currently it's contains only https://github.com/Azure/sonic-frr/blob/88351c8f6df5450e9098f773813738f62abb2f5e/tools/frr-reload.py
I think we can run in on python2.7 and we can install it inside of dockerfile if we need it.

pavel-shirshov · 2019-05-14T23:10:58Z

We need more free space for our Jenkins

pavel-shirshov · 2019-05-14T23:11:52Z

both model are supported, if it is unified configuration model, then use frr.conf. if it is separated configuration model, then use zebra.conf, bgpd.conf, and staticd.conf.

Currently frr.conf has preference over bgpd.conf/zebra.com/staticd.conf

src/libyang/Makefile

rules/libyang.mk

sonic-slave-stretch/Dockerfile

nazariig · 2019-05-15T13:44:39Z

dockers/docker-fpm-frr/supervisord.conf

+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog


@lguohan @pavel-shirshov can we force this fix with a separate PR?

@pavel-shirshov our regression fails because frr is missing staticd which is essential part of this suite, so i would like to ask you to force this fix

@nazarii-gnydyn
Can you please share some output?
On our side I see:

# ps ax PID TTY STAT TIME COMMAND 1 pts/0 Ss+ 0:01 /usr/bin/python /usr/bin/supervisord 25 pts/0 Sl 0:00 /usr/sbin/rsyslogd -n 30 pts/0 S 0:00 python /usr/bin/bgpcfgd 33 pts/0 Sl 0:08 /usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M fpm 36 pts/0 S 0:00 /usr/lib/frr/staticd -A 127.0.0.1 39 pts/0 Sl 0:02 /usr/lib/frr/bgpd -A 127.0.0.1 47 pts/0 Sl 0:27 fpmsyncd 49 pts/1 Ss 0:00 bash 65 pts/1 R+ 0:00 ps ax

@pavel-shirshov On our side (without this fix):

root@sonic:/home/admin# docker exec -ti bgp bash root@sonic:/# ps -aux USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND root 1 0.5 0.2 58600 20444 pts/0 Ss+ 13:03 0:00 /usr/bin/python /usr/bin/supervisord root 29 0.0 0.0 250136 2860 pts/0 Sl 13:03 0:00 /usr/sbin/rsyslogd -n root 34 0.0 0.1 45556 13788 pts/0 S 13:03 0:00 python /usr/bin/bgpcfgd frr 37 0.1 0.0 298552 5884 pts/0 Sl 13:03 0:00 /usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M fpm frr 39 0.1 0.1 299900 8964 pts/0 Sl 13:03 0:00 /usr/lib/frr/bgpd -A 127.0.0.1 root 45 0.5 0.0 101356 4096 pts/0 Sl 13:03 0:00 fpmsyncd root 47 2.5 0.0 18184 3152 pts/1 Ss 13:05 0:00 bash root 53 0.0 0.0 36632 2748 pts/1 R+ 13:05 0:00 ps -aux root@sonic:/# supervisorctl status bgpcfgd RUNNING pid 34, uptime 0:02:00 bgpd RUNNING pid 39, uptime 0:01:59 fpmsyncd RUNNING pid 45, uptime 0:01:59 rsyslogd RUNNING pid 29, uptime 0:02:00 start.sh EXITED May 17 01:03 PM vtysh_b STOPPED Not started zebra RUNNING pid 37, uptime 0:01:59

lguohan · 2019-05-16T06:43:18Z

retest this please

nazariig · 2019-05-17T13:08:40Z

#2914

pavel-shirshov · 2019-05-17T16:14:10Z

@nazariig So it wasn't about staticd, but about swig. I have approved your PR. I'll push it as soon as mellonox build is done.

* Update frr to frr-7.0.1 * Fix a typo * Set right permissions on /etc/frr * Convert external file links from debian to Azure * Revert python3 fix * Build frr using more than 1 job * Add SWIG as dependency for libswss-common

…atically (#15812) #### Why I did it src/sonic-utilities ``` * 51c7a43c - (HEAD -> master, origin/master, origin/HEAD) [show][muxcable] update `show mux config` to print out `soc_ipv6` as well (#2909) (6 hours ago) [Jing Zhang] * fd497755 - [route_check][dualtor] Ignore vlan neighbor route miss (#2888) (18 hours ago) [Longxiang Lyu] * 81c0ed4e - [show][muxcable] update `show mux tunnel-route` to check soc_ipv6 as well (33 hours ago) [Jing Zhang] * 1ee73668 - [db_migrator] Migrate DNS configuratuion (#2893) (2 days ago) [ganglv] * 553a3432 - [dualtor][route_check] filter out `soc_ipv6` (#2899) (2 days ago) [Jing Zhang] ``` #### How I did it #### How to verify it #### Description for the changelog

…atically (#15835) src/sonic-utilities * bc7c7929 - (HEAD -> 202205, origin/202205) Add FEC correctable and uncorrectable port stats (#2027) (10 hours ago) [Prince George] * 58db48ad - [show][muxcable] update `show mux tunnel-route` to check soc_ipv6 as well (10 hours ago) [Jing Zhang] * 24fc1db8 - [dualtor][route_check] filter out `soc_ipv6` (#2899) (10 hours ago) [Jing Zhang] * d89d4832 - [route_check][dualtor] Ignore vlan neighbor route miss (#2888) (10 hours ago) [Longxiang Lyu]

…atically (sonic-net#15812) #### Why I did it src/sonic-utilities ``` * 51c7a43c - (HEAD -> master, origin/master, origin/HEAD) [show][muxcable] update `show mux config` to print out `soc_ipv6` as well (sonic-net#2909) (6 hours ago) [Jing Zhang] * fd497755 - [route_check][dualtor] Ignore vlan neighbor route miss (sonic-net#2888) (18 hours ago) [Longxiang Lyu] * 81c0ed4e - [show][muxcable] update `show mux tunnel-route` to check soc_ipv6 as well (33 hours ago) [Jing Zhang] * 1ee73668 - [db_migrator] Migrate DNS configuratuion (sonic-net#2893) (2 days ago) [ganglv] * 553a3432 - [dualtor][route_check] filter out `soc_ipv6` (sonic-net#2899) (2 days ago) [Jing Zhang] ``` #### How I did it #### How to verify it #### Description for the changelog

…t to verify consistency between kernel and ASIC (sonic-net#2840) * za32ddc1 [show][muxcable] update to print out as well (sonic-net#2909) * 0c6d0c5 [202205] Flush RESTAPI db in fast-reboot shutdown path (sonic-net#2921) * bc7c792 Add FEC correctable and uncorrectable port stats (sonic-net#2027) * 58db48a [show][muxcable] update to check soc_ipv6 as well * 24fc1db [dualtor][route_check] filter out (sonic-net#2899) * d89d483 [route_check][dualtor] Ignore vlan neighbor route miss (sonic-net#2888)

Update frr to frr-7.0.1

0b568b6

pavel-shirshov added Enhancement ➕ Submodule Update ⏫ Not Ready to Merge 🕑 labels May 14, 2019

pavel-shirshov requested a review from lguohan May 14, 2019 20:00

pavel-shirshov self-assigned this May 14, 2019

qiluo-msft reviewed May 14, 2019

View reviewed changes

src/python3/Makefile Outdated Show resolved Hide resolved

sonic-net deleted a comment from paulnice May 14, 2019

pavel-shirshov commented May 14, 2019

View reviewed changes

src/libyang/Makefile Outdated Show resolved Hide resolved

lguohan reviewed May 15, 2019

View reviewed changes

rules/libyang.mk Outdated Show resolved Hide resolved

lguohan reviewed May 15, 2019

View reviewed changes

sonic-slave-stretch/Dockerfile Show resolved Hide resolved

nazariig reviewed May 15, 2019

View reviewed changes

pavel-shirshov added 6 commits May 15, 2019 13:58

Fix a typo

ec8a39e

Set right permissions on /etc/frr

145215e

Convert external file links from debian to Azure

07d41bf

Revert python3 fix

6a9233f

Build frr using more than 1 job

43458a5

Add SWIG as dependency for libswss-common

0750571

lguohan approved these changes May 16, 2019

View reviewed changes

pavel-shirshov merged commit 1e3b62f into master May 16, 2019

pavel-shirshov deleted the pavelsh/frr branch May 16, 2019 17:59

pavel-shirshov removed the Not Ready to Merge 🕑 label May 16, 2019

stcheng mentioned this pull request May 21, 2019

[frr]: Missing route change messages with ip route change commands #2909

Closed

nazariig mentioned this pull request Oct 7, 2020

[ethtool] Add ethtool patch to version 5.8 to support QSFP-DD cable parsing #5294

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FRR]: Update frr to frr-7.0.1 #2899

[FRR]: Update frr to frr-7.0.1 #2899

pavel-shirshov commented May 14, 2019 •

edited

Loading

lguohan commented May 14, 2019

lguohan commented May 14, 2019

lguohan commented May 14, 2019

qiluo-msft commented May 14, 2019 •

edited

Loading

pavel-shirshov commented May 14, 2019

pavel-shirshov commented May 14, 2019

pavel-shirshov commented May 14, 2019

pavel-shirshov commented May 14, 2019

nazariig May 15, 2019

pavel-shirshov May 15, 2019

nazariig May 16, 2019 •

edited

Loading

pavel-shirshov May 16, 2019

nazariig May 17, 2019 •

edited

Loading

lguohan commented May 16, 2019

nazariig commented May 17, 2019

pavel-shirshov commented May 17, 2019

[FRR]: Update frr to frr-7.0.1 #2899

[FRR]: Update frr to frr-7.0.1 #2899

Conversation

pavel-shirshov commented May 14, 2019 • edited Loading

lguohan commented May 14, 2019

lguohan commented May 14, 2019

lguohan commented May 14, 2019

qiluo-msft commented May 14, 2019 • edited Loading

pavel-shirshov commented May 14, 2019

pavel-shirshov commented May 14, 2019

pavel-shirshov commented May 14, 2019

pavel-shirshov commented May 14, 2019

nazariig May 15, 2019

Choose a reason for hiding this comment

pavel-shirshov May 15, 2019

Choose a reason for hiding this comment

nazariig May 16, 2019 • edited Loading

Choose a reason for hiding this comment

pavel-shirshov May 16, 2019

Choose a reason for hiding this comment

nazariig May 17, 2019 • edited Loading

Choose a reason for hiding this comment

lguohan commented May 16, 2019

nazariig commented May 17, 2019

pavel-shirshov commented May 17, 2019

pavel-shirshov commented May 14, 2019 •

edited

Loading

qiluo-msft commented May 14, 2019 •

edited

Loading

nazariig May 16, 2019 •

edited

Loading

nazariig May 17, 2019 •

edited

Loading