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 sonic-frr submodule to FRR 8.2.2 #11502

Merged
merged 1 commit into from
Sep 10, 2022

Conversation

hasan-brcm
Copy link
Contributor

@hasan-brcm hasan-brcm commented Jul 21, 2022

Why I did it

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.

How I did it

  • checkout FRR 8.2.2 commit id 79188bf in sonic-frr/frr
  • commit and push

How to verify it

  • build and load

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205

Description for the changelog

Update sonic-frr/frr submodule to frr 8.2.2 commit 79188bf

Link to config_db schema for YANG module changes

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

@DavidZagury
Copy link
Contributor

It should also be backported to 202205

@hasan-brcm hasan-brcm marked this pull request as ready for review July 21, 2022 06:27
@hasan-brcm hasan-brcm requested a review from lguohan as a code owner July 21, 2022 06:27
@zhangyanzhao
Copy link
Collaborator

Need merge this issue for 202205.

@yxieca yxieca requested a review from abdosi August 4, 2022 15:52
@dgsudharsan
Copy link
Collaborator

I went through the list of patches that were removed in the FRR upgrade #10691.

There is one patch of concern.

src/sonic-frr/patch/0009-Link-local-scope-was-not-set-while-binding-socket-for-bgp-ipv6-link-local-neighbors.patch

In FRR
Introduced: sonic-net/sonic-frr@0b6d353

Reverted: sonic-net/sonic-frr@6740a19 (FRRouting/frr#8430)

However, this patch was introduced in SONiC but never reverted. Now with upgrading to FRR and without this patch won’t we be facing issues?

@hasan-brcm
Copy link
Contributor Author

hasan-brcm commented Aug 15, 2022

I went through the list of patches that were removed in the FRR upgrade #10691.

There is one patch of concern.

src/sonic-frr/patch/0009-Link-local-scope-was-not-set-while-binding-socket-for-bgp-ipv6-link-local-neighbors.patch

In FRR Introduced: sonic-net/sonic-frr@0b6d353

Reverted: sonic-net/sonic-frr@6740a19 (FRRouting/frr#8430)

However, this patch was introduced in SONiC but never reverted. Now with upgrading to FRR and without this patch won’t we be facing issues?

Please note that patch file 0009-Link-local-scope.. has been replaced with 0008-Link-local-scope..:

Regarding the changes in the old 0009-Link-local-scope patch file, there were two changes originally. One of the changes (in bgp_update_address()) has been carried to the new patch file, and the other change (in bgp_zebra_nexthop_set()) is already present in the 8.2.2 code. I hope this clarifies.

@adyeung
Copy link
Collaborator

adyeung commented Aug 17, 2022

/easycla

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Aug 17, 2022

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: hasan-brcm / name: Hasan Naqvi (35b89c9)

Copy link
Collaborator

@dgsudharsan dgsudharsan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your explanation. However I see the changes in patch 0008-Link-local-scope-was-not-set-while-binding-socket-for-bgp-ipv6-link-local-neighbors.patch are not in upstream FRR since they were reverted. I am not sure if SONiC would allow patches that are not in upstream. @lguohan @prsunny @abdosi can you please provide feedback here?

@liat-grozovik
Copy link
Collaborator

@prsunny could you please help to review prev comment? As 202205 should include the new frr version I believe we need to push this with high prio. If fix still need to be done let's close the gap

@prsunny prsunny merged commit c53972b into sonic-net:master Sep 10, 2022
dgsudharsan pushed a commit to dgsudharsan/sonic-buildimage that referenced this pull request Sep 14, 2022
*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.
prsunny pushed a commit that referenced this pull request Sep 15, 2022
*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>
yejianquan added a commit that referenced this pull request Oct 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants