Add frr-reload.py to FRR container #2462

mslocrian · 2019-01-18T05:52:38Z

- What I did
I have added frr-reload.py to the frr docker container.

For those who don't use it, it is a great tool for those who want to deploy their own frr configuration to the sonic host. You can do the following:

push an updated frr.conf to /etc/sonic/frr/frr.conf
ensure your frr.conf is functional - docker exec -ti bgp vtysh -f /etc/frr/frr.conf --dryrun
run docker exec -ti bgp /usr/bin/frr-reload.py --reload /etc/frr/frr.conf

frr-reload.py makes a local copy of running config, and compares it to the provided config. It then only applies the diffs to vtysh. It's much nicer than pushing a config and having to reload a container (in the majority of cases)

Note, I haven't actually rebuilt the sonic image and tested this properly, but I shall!

- How I did it
Copied frr-reload.py from FRR repo into frr container and modified Dockerfile.j2

- How to verify it

- Description for the changelog
Added frr-reload.py to FRR container.

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

Signed-off-by: Stegen Smith <stegen@owns.com>

mslocrian · 2019-01-18T05:55:21Z

Erm. Accidentally have the daemons and daemons.conf changes in here too.

Signed-off-by: Stegen Smith <stegen@owns.com>

mslocrian · 2019-01-18T06:03:52Z

Rebased! Should have branched the other PR of mine.

nikos-github · 2019-01-18T06:41:32Z

I believe this is part of the pythontools debian pkg that is built along with frr. Perhaps it is best for those who need it, to install the pkg rather than bring it into sonic-buildimage as it then becomes difficult to track and reflect any changes to it from its source location. Sonic team can comment here @lguohan

mslocrian · 2019-01-18T22:18:14Z

I believe this is part of the pythontools debian pkg that is built along with frr. Perhaps it is best for those who need it, to install the pkg rather than bring it into sonic-buildimage as it then becomes difficult to track and reflect any changes to it from its source location. Sonic team can comment here @lguohan

Ah, you're right: https://github.com/FRRouting/frr/releases. frr-pythontools*.deb

Personally, if people are going to be using the features that you've added to allow to split frr configuration, then this would be a super helpful utility to just have on hand.

That being said, if someone is going to make the conscious decision to enable the split frr functionality, then I suppose that they can also just install it.

So, I suppose that there are two questions.

Do the powers to be think it's a helpful enough utility to include?
If so, would that be something to be added to docker_fpm_frr_debs (wherever that is)?

Signed-off-by: Stegen Smith <stegen@owns.com>

mslocrian · 2019-01-29T00:47:06Z

@nikos-github, I've shuffled things around so I'm not COPY'ing the file directly, but installing the frr-pythonutils package which is built when the frr package is built.

This should keep things consistent for when one upgrades frr.

I suppose the discussion of whether or not it should be included in the base image should still be had, but it's a slick utility for those wanting to externally manage frr.conf.

mslocrian · 2019-01-29T17:11:04Z

Verified change works in fresh image install.

root@sonic:/home/sonic# docker exec -t -i bgp ls /usr/lib/frr
babeld	eigrpd	       frrcommon.sh  ldpd    ospfd  ripd     watchfrr
bfdd	frr-reload     frrinit.sh    nhrpd   pbrd   ripngd   watchfrr.sh
bgpd	frr-reload.py  isisd	     ospf6d  pimd   staticd  zebra
root@sonic:/home/sonic# docker exec -t -i bgp dpkg --list | grep frr
ii  frr            6.0.2-201901 amd64        FRRouting suite of internet proto
ii  frr-pythontool 6.0.2-201901 all          FRRouting suite - Python tools
root@sonic:/home/sonic# show version
SONiC Software Version: SONiC.add_frr_reload.0-dirty-20190128.181135
Distribution: Debian 9.7
Kernel: 4.9.0-8-amd64
Build commit: 0777bc0
Build date: Tue Jan 29 03:57:43 UTC 2019

batmancn · 2019-01-30T06:41:01Z

So, does this PR is for save configure in sonic-frr? #2355 is another way for this. Maybe some conflict, I have to have a look.

mslocrian · 2019-01-30T06:52:32Z

@batmancn,

This is for a different use case. @nikos-github has done some great work in splitting out the frr config from something that is managed within sonic, to being able to manage it outside.

The frr-pythontool package is for the latter case. What you can do is place a new frr config, parse it through the frr-reload.py and it only applies the diff of running config to your desired config. When you want to get a config into place without having to touch the bgpd process, then that can be pretty useful.

batmancn · 2019-01-30T07:50:13Z

@batmancn,

This is for a different use case. @nikos-github has done some great work in splitting out the frr config from something that is managed within sonic, to being able to manage it outside.

The frr-pythontool package is for the latter case. What you can do is place a new frr config, parse it through the frr-reload.py and it only applies the diff of running config to your desired config. When you want to get a config into place without having to touch the bgpd process, then that can be pretty useful.

Great, That's cool.

If there is some SPEC or PR about these work?

mslocrian · 2019-01-31T17:08:05Z

The PR for the spit config can be found here:
#2286

The file/package that I am adding to the container is already part of the FRR software.
https://github.com/FRRouting/frr/releases

The package is already getting built when sonic goes through its own frr build in the sonic-frr repo. I'm just copying that package over for inclusion to the rest of the build process, and getting it added to the deb package list for installation only in the sonic-frr container.

nikos-github · 2019-01-31T22:33:50Z

I'll take a look. This approach is preferred.

nikos-github · 2019-02-08T22:50:55Z

dockers/docker-fpm-frr/daemons

@@ -36,7 +36,7 @@ fabricd=no
 # Check /etc/pam.d/frr if you intend to use "vtysh"!
 #
 vtysh_enable=yes
-zebra_options="  -A 127.0.0.1 -s 90000000 -M fpm"


Why are you removing this?

That actually should not have happened. I can't recall why/how that file would have changed, or perhaps I merged something in which I shouldn't have. My bad!

Thank you and good catch. It's been fixed.

nikos-github · 2019-02-18T05:55:14Z

retest this please

mslocrian · 2019-02-26T22:28:24Z

@nikos-github , I've rebuilt and reinstalled the image. Things are looking good from that perspective.

root@sonic:/usr/lib/frr# grep zeb /etc/frr/daemons
# The watchfrr and zebra daemons are always started.
zebra_options="  -A 127.0.0.1 -s 90000000 -M fpm"
root@sonic:/usr/lib/frr# ps uaxww | grep zeb
root        69  0.0  0.0  80092  2732 ?        Ss   16:16   0:03 /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         84  0.0  0.2 411976 37828 ?        Ssl  16:16   0:02 /usr/lib/frr/zebra -d -A 127.0.0.1 -s 90000000 -M fpm
root       589  0.0  0.0  11128   996 pts/1    S+   22:27   0:00 grep zeb
root@sonic:/usr/lib/frr# pwd 
/usr/lib/frr
root@sonic:/usr/lib/frr# ls
babeld	bfdd  bgpd  eigrpd  frr-reload	frr-reload.py  frrcommon.sh  frrinit.sh  isisd	ldpd  nhrpd  ospf6d  ospfd  pbrd  pimd	ripd  ripngd  staticd  watchfrr  watchfrr.sh  zebra
root@sonic:/usr/lib/frr# ls -l frr-reload
-rwxr-xr-x 1 root root 198 Feb 24 04:16 frr-reload
root@sonic:/usr/lib/frr# ls -l frr-reload.py 
-rwxr-xr-x 1 root root 52120 Feb 26 06:25 frr-reload.py
root@sonic:/usr/lib/frr#

Any other testing that you are looking for?

nikos-github · 2019-02-27T05:23:25Z

@mslocrian The retest this was not for you. It's a jenkins trigger to rerun the tests because they were failing when it first run.

nikos-github · 2019-02-27T05:24:41Z

@lguohan Can we merge this after you review?

nikos-github · 2019-04-23T04:23:01Z

@lguohan This will be conflicting with my debian stretch frr changes. Are we getting it merged or should I include in my diffs?

mslocrian · 2019-04-23T23:11:42Z

Would be excited to see this included, @lguohan! Thanks for pushing on it @nikos-github

lguohan · 2019-05-09T08:10:12Z

duplicated as #2819

Update sonic-swss submodule pointer to include the following: * 8eea92e [202205][counters] Revert PR sonic-net#2432 for the buffer queue/pg counters improvement ([sonic-net#2462](sonic-net/sonic-swss#2462)) * 5d8636a [202205] Enhance orchagent and buffer manager in error handling (sonic-net#2414) ([sonic-net#2449](sonic-net/sonic-swss#2449)) * aa22237 [Everflow/ERSPAN] Set correct destination port and mac address when the nexthop is updated for ERSPAN mirror destination (sonic-net#2392) ([sonic-net#2455](sonic-net/sonic-swss#2455)) * 04ce7be check state_db for po before sending ARP/ND pkts (sonic-net#2444) ([sonic-net#2450](sonic-net/sonic-swss#2450)) * f0138a2 [portmgr] Fixed the orchagent crash due to late arrival of notif (sonic-net#2431) ([sonic-net#2451](sonic-net/sonic-swss#2451)) * 7cfde48 Change the log messages in addKernelNeigh/Route from ERROR to INFO ([sonic-net#2437](sonic-net/sonic-swss#2437)) * 2c5116e [202205][counters] Improve performance by polling only configured ports buffer queue/pg counters ([sonic-net#2432](sonic-net/sonic-swss#2432)) Signed-off-by: dgsudharsan <sudharsand@nvidia.com>

Update sonic-swss submodule pointer to include the following: * 8eea92e [202205][counters] Revert PR #2432 for the buffer queue/pg counters improvement ([#2462](sonic-net/sonic-swss#2462)) * 5d8636a [202205] Enhance orchagent and buffer manager in error handling (#2414) ([#2449](sonic-net/sonic-swss#2449)) * aa22237 [Everflow/ERSPAN] Set correct destination port and mac address when the nexthop is updated for ERSPAN mirror destination (#2392) ([#2455](sonic-net/sonic-swss#2455)) * 04ce7be check state_db for po before sending ARP/ND pkts (#2444) ([#2450](sonic-net/sonic-swss#2450)) * f0138a2 [portmgr] Fixed the orchagent crash due to late arrival of notif (#2431) ([#2451](sonic-net/sonic-swss#2451)) * 7cfde48 Change the log messages in addKernelNeigh/Route from ERROR to INFO ([#2437](sonic-net/sonic-swss#2437)) * 2c5116e [202205][counters] Improve performance by polling only configured ports buffer queue/pg counters ([#2432](sonic-net/sonic-swss#2432))

updated daemons for frr 6.0.2

0c3cb0c

Signed-off-by: Stegen Smith <stegen@owns.com>

rebased for only frr-reload.py commit

256eb70

Signed-off-by: Stegen Smith <stegen@owns.com>

mslocrian added 3 commits January 25, 2019 09:13

merged master

638f716

Merge branch 'master' of https://github.com/Azure/sonic-buildimage

373375b

getting frr-pythontools in there properly

0777bc0

Signed-off-by: Stegen Smith <stegen@owns.com>

mslocrian mentioned this pull request Feb 1, 2019

arp entry is not learned on a vlan subinterface (dot1q tagged) sonic-net/SONiC#109

Open

mslocrian added 3 commits February 4, 2019 21:44

Merge branch 'master' of https://github.com/azure/sonic-buildimage

61e454a

Merge branch 'master' of https://github.com/azure/sonic-buildimage

396d386

Merge branch 'master' into add_frr_reload

970f233

nikos-github suggested changes Feb 8, 2019

View reviewed changes

re-added -M fpm.

4c50b92

nikos-github approved these changes Feb 18, 2019

View reviewed changes

mslocrian added 2 commits February 19, 2019 10:11

Merge branch 'master' of https://github.com/Azure/sonic-buildimage

5711dd2

Merge branch 'master' into add_frr_reload

f8795b9

lguohan closed this May 9, 2019

gechiang mentioned this pull request Sep 20, 2022

[202205] [submodule] Advance sonic-swss pointer #12095

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add frr-reload.py to FRR container #2462

Add frr-reload.py to FRR container #2462

mslocrian commented Jan 18, 2019

mslocrian commented Jan 18, 2019

mslocrian commented Jan 18, 2019

nikos-github commented Jan 18, 2019

mslocrian commented Jan 18, 2019

mslocrian commented Jan 29, 2019

mslocrian commented Jan 29, 2019

batmancn commented Jan 30, 2019 •

edited

Loading

mslocrian commented Jan 30, 2019

batmancn commented Jan 30, 2019 •

edited

Loading

mslocrian commented Jan 31, 2019

nikos-github commented Jan 31, 2019

nikos-github Feb 8, 2019

mslocrian Feb 8, 2019

nikos-github commented Feb 18, 2019

mslocrian commented Feb 26, 2019

nikos-github commented Feb 27, 2019 •

edited

Loading

nikos-github commented Feb 27, 2019

nikos-github commented Apr 23, 2019 •

edited

Loading

mslocrian commented Apr 23, 2019

lguohan commented May 9, 2019

Add frr-reload.py to FRR container #2462

Add frr-reload.py to FRR container #2462

Conversation

mslocrian commented Jan 18, 2019

mslocrian commented Jan 18, 2019

mslocrian commented Jan 18, 2019

nikos-github commented Jan 18, 2019

mslocrian commented Jan 18, 2019

mslocrian commented Jan 29, 2019

mslocrian commented Jan 29, 2019

batmancn commented Jan 30, 2019 • edited Loading

mslocrian commented Jan 30, 2019

batmancn commented Jan 30, 2019 • edited Loading

mslocrian commented Jan 31, 2019

nikos-github commented Jan 31, 2019

nikos-github Feb 8, 2019

Choose a reason for hiding this comment

mslocrian Feb 8, 2019

Choose a reason for hiding this comment

nikos-github commented Feb 18, 2019

mslocrian commented Feb 26, 2019

nikos-github commented Feb 27, 2019 • edited Loading

nikos-github commented Feb 27, 2019

nikos-github commented Apr 23, 2019 • edited Loading

mslocrian commented Apr 23, 2019

lguohan commented May 9, 2019

batmancn commented Jan 30, 2019 •

edited

Loading

batmancn commented Jan 30, 2019 •

edited

Loading

nikos-github commented Feb 27, 2019 •

edited

Loading

nikos-github commented Apr 23, 2019 •

edited

Loading