Frr 8.2 upgrade #10691

hasan-brcm · 2022-04-26T19:46:08Z

Why I did it

Upgrade FRR to version 8.2.2. Build libyang2 required by FRR.

How I did it

Update FRR version and tag.

How to verify it

Following tests were performed on sonic-vs:

BGP docker status check
BGP configuration and session establishment
Route redistribution and ping
Issued show commands to check the bgp neighbor and routes
Checked app-db to ensure bgp routes are installed with correct interface and nexthop.
Create VRF and check FRR knows the VRF
Check VRF routes are installed in app-db with correct Vrf name and next-hop
Establish BGP Evpn session and check if Evpn routes (multicast, mac, prefix) are exchanged and installed correctly in app-db.

Which release branch to backport (provide reason below if selected)

Description for the changelog

Link to config_db schema for YANG module changes

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

ghost · 2022-04-26T19:46:21Z

All CLA requirements met.

hasan-brcm · 2022-04-27T23:10:19Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2022-04-27T23:10:21Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-04-27T23:10:33Z

Azure Pipelines successfully started running 1 pipeline(s).

hasan-brcm · 2022-04-28T23:29:03Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2022-04-28T23:29:04Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-04-28T23:29:16Z

Azure Pipelines successfully started running 1 pipeline(s).

lguohan · 2022-04-30T17:44:23Z

can you also upgrade frr docker to bullseye?

- FRR 8.2.2 upgrade - Build libyang2

hasan-brcm · 2022-05-04T18:19:31Z

Build failing due to issue #10738

hasan-brcm · 2022-05-05T06:05:25Z

can you also upgrade frr docker to bullseye?
There are no separate changes for buster/bullseye. Both of the builds should use frr 8.2.2 now. I can see it got built for bullseye:
2022-05-05T04:12:31.0610350Z [ finished ] [ target/debs/bullseye/frr_8.2.2-sonic-0_amd64.deb ]

hasan-brcm · 2022-05-05T20:46:24Z

kvmtest-t1-lag failed with below error:
##[error]We stopped hearing from agent sonic-build-workers-000EIM. Verify the agent machine is running and has a healthy network connection. Anything that terminates an agent process, starves it for CPU, or blocks its network access can cause this error. For more information, see: https://go.microsoft.com/fwlink/?linkid=846610

hasan-brcm · 2022-05-05T20:46:45Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2022-05-05T20:46:46Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-05-05T20:46:59Z

Azure Pipelines successfully started running 1 pipeline(s).

lguohan · 2022-05-06T16:17:11Z

sonic-slave-buster/Dockerfile.j2

@@ -90,7 +90,7 @@ RUN apt-get update && apt-get install -y \
        imagemagick \
        ghostscript \
        groff \
-        libpcre3-dev \
+        libpcre2-dev \


why this change?

libpcre2 is required by libyang2 when building buster. This dependency error is not seen in bullseye build, though. That's why the change only in buster.

dpkg-source: info: extracting libyang2 in libyang2-2.0.112
dpkg-source: info: unpacking libyang2_2.0.112.orig.tar.gz
dpkg-source: info: unpacking libyang2_2.0.112-6.debian.tar.xz
/sonic/src/libyang2/libyang2-2.0.112 /sonic/src/libyang2
dpkg-buildpackage: info: source package libyang2
dpkg-buildpackage: info: source version 2.0.112-6
dpkg-buildpackage: info: source distribution unstable
dpkg-buildpackage: info: source changed by Ondřej Surý ondrej@debian.org
dpkg-source --before-build .
dpkg-buildpackage: info: host architecture amd64
dpkg-checkbuilddeps: error: Unmet build dependencies: libpcre2-dev
dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting
dpkg-buildpackage: warning: (Use -d flag to override.)
make[1]: *** [Makefile:21: /sonic/target/debs/buster/libyang2_2.0.112-6_amd64.deb] Error 3
make[1]: Leaving directory '/sonic/src/libyang2'
[ FAIL LOG END ] [ target/debs/buster/libyang2_2.0.112-6_amd64.deb ]
make: *** [slave.mk:493: target/debs/buster/libyang2_2.0.112-6_amd64.deb] Error 1
make: *** Waiting for unfinished jobs....
DEPRECATION: Python 2.7 reached the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 is no longer maintained. pip 21.0 will drop support for Python 2.7 in January 2021. More details about Python 2 support in pip can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support pip 21.0 will remove support for this functionality.
Makefile.work:332: recipe for target 'buster' failed
make[1]: *** [buster] Error 2
make[1]: Leaving directory '/projects/csg_sonic2/sr407497/sonic_repos/community_0419/sonic-buildimage'
Makefile:30: recipe for target 'target/debs/buster/frr_8.2.2-sonic-0_amd64.deb' failed
make: *** [target/debs/buster/frr_8.2.2-sonic-0_amd64.deb] Error 2

Btw, libpcre3 is already present at L#150 in the same file.

adyeung · 2022-05-09T21:19:12Z

@prsunny @yxieca can someone from MSFT review and signoff pls?

lguohan · 2022-05-10T16:27:21Z

src/sonic-frr/patch/0006-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch


-SONiC runs frr inside a docker and the logs are sent to base image


can you please not remove the original comments for the patch?

lguohan · 2022-05-10T16:27:41Z

src/sonic-frr/patch/0006-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch

@@ -1,14 +1,8 @@
-From 31464e3fd0f677bc15286e99d4a30e2e33480c53 Mon Sep 17 00:00:00 2001
-From: Ying Xie <ying.xie@microsoft.com>


can you keep the original patch author here?

lguohan · 2022-05-10T16:28:55Z

can you please keep original comments for all patches and original author here. updating a patch to a new release should not remove the original author, it would be difficult to track why the patch is made.

- FRR 8.2.2 upgrade - Build libyang2

hasan-brcm · 2022-05-11T01:02:03Z

can you please keep original comments for all patches and original author here. updating a patch to a new release should not remove the original author, it would be difficult to track why the patch is made.

Done. Updated all of the patches.. kept original author and commit date intact.

zhangyanzhao · 2022-05-16T21:42:49Z

add @abdosi for review.

abdosi

Can we please update PR description of testing done with this new version.

hasan-brcm · 2022-05-19T01:16:27Z

Can we please update PR description of testing done with this new version.

Done.

abdosi · 2022-05-20T23:11:55Z

LGTM

liushilongbuaa · 2022-05-27T03:07:15Z

rules/libyang2.mk

+LIBYANG2_DBG = libyang2-dbgsym_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(LIBYANG2),$(LIBYANG2_DBG)))
+
+LIBYANG2_CPP = libyang2-cpp1_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb


It seems this deb package didn't exist

This reverts commit a477dbb.

This reverts commit 28a1071.

…anch Related work items: #52, #71, #73, #75, #77, sonic-net#1306, sonic-net#1588, sonic-net#1991, sonic-net#2031, sonic-net#2040, sonic-net#2053, sonic-net#2066, sonic-net#2069, sonic-net#2087, sonic-net#2107, sonic-net#2110, sonic-net#2112, sonic-net#2113, sonic-net#2117, sonic-net#2124, sonic-net#2125, sonic-net#2126, sonic-net#2128, sonic-net#2130, sonic-net#2131, sonic-net#2132, sonic-net#2133, sonic-net#2134, sonic-net#2135, sonic-net#2136, sonic-net#2137, sonic-net#2138, sonic-net#2139, sonic-net#2140, sonic-net#2143, sonic-net#2158, sonic-net#2161, sonic-net#2233, sonic-net#2243, sonic-net#2250, sonic-net#2254, sonic-net#2260, sonic-net#2261, sonic-net#2267, sonic-net#2278, sonic-net#2282, sonic-net#2285, sonic-net#2288, sonic-net#2289, sonic-net#2292, sonic-net#2294, sonic-net#8887, sonic-net#9279, sonic-net#9390, sonic-net#9511, sonic-net#9700, sonic-net#10025, sonic-net#10322, sonic-net#10479, sonic-net#10484, sonic-net#10493, sonic-net#10500, sonic-net#10580, sonic-net#10595, sonic-net#10628, sonic-net#10634, sonic-net#10635, sonic-net#10644, sonic-net#10670, sonic-net#10691, sonic-net#10716, sonic-net#10731, sonic-net#10750, sonic-net#10751, sonic-net#10752, sonic-net#10761, sonic-net#10769, sonic-net#10775, sonic-net#10776, sonic-net#10779, sonic-net#10786, sonic-net#10792, sonic-net#10793, sonic-net#10800, sonic-net#10806, sonic-net#10826, sonic-net#10839, sonic-net#10840, sonic-net#10842, sonic-net#10844, sonic-net#10847, sonic-net#10849, sonic-net#10852, sonic-net#10865, sonic-net#10872, sonic-net#10877, sonic-net#10886, sonic-net#10889, sonic-net#10903, sonic-net#10904, sonic-net#10905, sonic-net#10913, sonic-net#10914, sonic-net#10916, sonic-net#10919, sonic-net#10925, sonic-net#10926, sonic-net#10929, sonic-net#10933, sonic-net#10934, sonic-net#10937, sonic-net#10941, sonic-net#10947, sonic-net#10952, sonic-net#10953, sonic-net#10957, sonic-net#10959, sonic-net#10971, sonic-net#10972, sonic-net#10980

DavidZagury · 2022-07-04T15:02:57Z

The submodule on src/sonic-frr/frr is still pointing to hash c69608a which is part of the FRR branch origin/frr/7.5 and is tagged as version frr-7.5.1-s1.

Shouldn't we also update the submodule?
@lguohan

*The sonic-frr was upgraded to FRR 8.2.2 as part of PR #10691. However, sonic-frr/frr submodule was still referring to previous 7.5 version. Update the sonic-frr/frr submodule to 8.2.2 commit id. Fixes issue #11484.

*The sonic-frr was upgraded to FRR 8.2.2 as part of PR sonic-net#10691. However, sonic-frr/frr submodule was still referring to previous 7.5 version. Update the sonic-frr/frr submodule to 8.2.2 commit id. Fixes issue sonic-net#11484.

*The sonic-frr was upgraded to FRR 8.2.2 as part of PR #10691. However, sonic-frr/frr submodule was still referring to previous 7.5 version. Update the sonic-frr/frr submodule to 8.2.2 commit id. Fixes issue #11484. Co-authored-by: Hasan Naqvi <56742004+hasan-brcm@users.noreply.github.com>

hasan-brcm requested review from qiluo-msft, xumia and lguohan as code owners April 26, 2022 19:46

Changes:

1e38ffe

- FRR 8.2.2 upgrade - Build libyang2

hasan-brcm force-pushed the frr_8.2_upgrade branch from aefe687 to 5197f30 Compare May 4, 2022 05:52

lguohan reviewed May 6, 2022

View reviewed changes

hasan-brcm requested a review from lguohan May 6, 2022 21:08

jian-hong-wu mentioned this pull request May 7, 2022

IS-IS & Segment Routing test report 2022-0507 jian-hong-wu/blog#276

Open

lguohan reviewed May 10, 2022

View reviewed changes

Changes:

d937c13

- FRR 8.2.2 upgrade - Build libyang2

hasan-brcm force-pushed the frr_8.2_upgrade branch from 1d6971d to d937c13 Compare May 11, 2022 00:57

hasan-brcm requested a review from lguohan May 11, 2022 01:02

zhangyanzhao requested review from yxieca and abdosi May 12, 2022 15:34

abdosi reviewed May 18, 2022

View reviewed changes

hasan-brcm requested a review from abdosi May 19, 2022 18:56

abdosi approved these changes May 20, 2022

View reviewed changes

abdosi merged commit a477dbb into sonic-net:master May 24, 2022

liushilongbuaa reviewed May 27, 2022

View reviewed changes

mlok-nokia mentioned this pull request Jun 9, 2022

[master] orchagent exits in a multi-asic linecard in Chassis #11064

Closed

yozhao101 added a commit to yozhao101/sonic-buildimage that referenced this pull request Jun 14, 2022

Revert "Frr 8.2 upgrade (sonic-net#10691)"

28a1071

This reverts commit a477dbb.

yozhao101 added a commit to yozhao101/sonic-buildimage that referenced this pull request Jun 14, 2022

Revert "Revert "Frr 8.2 upgrade (sonic-net#10691)""

6eb68bd

This reverts commit 28a1071.

DavidZagury mentioned this pull request Jul 19, 2022

[FRR] Submodule was not updated to 8.2 #11484

Closed

hasan-brcm mentioned this pull request Jul 21, 2022

Update sonic-frr submodule to FRR 8.2.2 #11502

Merged

7 tasks

dgsudharsan mentioned this pull request Sep 14, 2022

[202205] Update submodule to FRR 8.2.2 #12074

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Frr 8.2 upgrade #10691

Frr 8.2 upgrade #10691

hasan-brcm commented Apr 26, 2022 •

edited

Loading

ghost commented Apr 26, 2022 •

edited by ghost

Loading

hasan-brcm commented Apr 27, 2022

mssonicbld commented Apr 27, 2022

azure-pipelines bot commented Apr 27, 2022

hasan-brcm commented Apr 28, 2022

mssonicbld commented Apr 28, 2022

azure-pipelines bot commented Apr 28, 2022

lguohan commented Apr 30, 2022 •

edited

Loading

hasan-brcm commented May 4, 2022 •

edited

Loading

hasan-brcm commented May 5, 2022 •

edited

Loading

hasan-brcm commented May 5, 2022

hasan-brcm commented May 5, 2022

mssonicbld commented May 5, 2022

azure-pipelines bot commented May 5, 2022

lguohan May 6, 2022

hasan-brcm May 6, 2022

hasan-brcm May 6, 2022

adyeung commented May 9, 2022

lguohan May 10, 2022

hasan-brcm May 11, 2022

lguohan May 10, 2022

hasan-brcm May 11, 2022

lguohan commented May 10, 2022

hasan-brcm commented May 11, 2022

zhangyanzhao commented May 16, 2022

abdosi left a comment

hasan-brcm commented May 19, 2022

abdosi commented May 20, 2022

liushilongbuaa May 27, 2022

DavidZagury commented Jul 4, 2022


		SONiC runs frr inside a docker and the logs are sent to base image

		@@ -1,14 +1,8 @@
		From 31464e3fd0f677bc15286e99d4a30e2e33480c53 Mon Sep 17 00:00:00 2001
		From: Ying Xie <ying.xie@microsoft.com>

Frr 8.2 upgrade #10691

Frr 8.2 upgrade #10691

Conversation

hasan-brcm commented Apr 26, 2022 • edited Loading

Why I did it

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Description for the changelog

Link to config_db schema for YANG module changes

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

ghost commented Apr 26, 2022 • edited by ghost Loading

hasan-brcm commented Apr 27, 2022

mssonicbld commented Apr 27, 2022

azure-pipelines bot commented Apr 27, 2022

hasan-brcm commented Apr 28, 2022

mssonicbld commented Apr 28, 2022

azure-pipelines bot commented Apr 28, 2022

lguohan commented Apr 30, 2022 • edited Loading

hasan-brcm commented May 4, 2022 • edited Loading

hasan-brcm commented May 5, 2022 • edited Loading

hasan-brcm commented May 5, 2022

hasan-brcm commented May 5, 2022

mssonicbld commented May 5, 2022

azure-pipelines bot commented May 5, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adyeung commented May 9, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lguohan commented May 10, 2022

hasan-brcm commented May 11, 2022

zhangyanzhao commented May 16, 2022

abdosi left a comment

Choose a reason for hiding this comment

hasan-brcm commented May 19, 2022

abdosi commented May 20, 2022

Choose a reason for hiding this comment

DavidZagury commented Jul 4, 2022

hasan-brcm commented Apr 26, 2022 •

edited

Loading

ghost commented Apr 26, 2022 •

edited by ghost

Loading

lguohan commented Apr 30, 2022 •

edited

Loading

hasan-brcm commented May 4, 2022 •

edited

Loading

hasan-brcm commented May 5, 2022 •

edited

Loading