[action] [PR:21095] [FRR]Fixing zebra to use internal rbtree per NS tree of ifps#495
Merged
r12f merged 1 commit intoAzure:202412from Jan 7, 2025
Merged
Conversation
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
** Make sure all your commits include a signature generated with `git commit -s` **
If this is a bug fix, make sure your description includes "fixes #xxxx", or
"closes #xxxx" or "resolves #xxxx"
Please provide the following information:
-->
#### Why I did it
Adding the below fix from FRR FRRouting/frr#17297
This is to fix the following crash which is a statistical issue
```
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
Core was generated by `/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl -M snmp'.
Program terminated with signal SIGABRT, Aborted.
#0 0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6
[Current thread is 1 (Thread 0x7fccd6faf7c0 (LWP 36))]
(gdb) bt
#0 0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6
Azure#1 0x00007fccd7302fb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6
Azure#2 0x00007fccd72ed472 in abort () from /lib/x86_64-linux-gnu/libc.so.6
Azure#3 0x00007fccd75bb3a9 in _zlog_assert_failed (xref=xref@entry=0x7fccd7652380 <_xref.16>, extra=extra@entry=0x0) at ../lib/zlog.c:678
Azure#4 0x00007fccd759b2fe in route_node_delete (node=<optimized out>) at ../lib/table.c:352
Azure#5 0x00007fccd759b445 in route_unlock_node (node=0x0) at ../lib/table.h:258
Azure#6 route_next (node=<optimized out>) at ../lib/table.c:436
Azure#7 route_next (node=node@entry=0x56029d89e560) at ../lib/table.c:410
Azure#8 0x000056029b6b6b7a in if_lookup_by_name_per_ns (ns=ns@entry=0x56029d873d90, ifname=ifname@entry=0x7fccc0029340 "PortChannel1020")
at ../zebra/interface.c:312
Azure#9 0x000056029b6b8b36 in zebra_if_dplane_ifp_handling (ctx=0x7fccc0029310) at ../zebra/interface.c:1867
Azure#10 zebra_if_dplane_result (ctx=0x7fccc0029310) at ../zebra/interface.c:2221
Azure#11 0x000056029b7137a9 in rib_process_dplane_results (thread=<optimized out>) at ../zebra/zebra_rib.c:4810
Azure#12 0x00007fccd75a0e0d in thread_call (thread=thread@entry=0x7ffe8e553cc0) at ../lib/thread.c:1990
Azure#13 0x00007fccd7559368 in frr_run (master=0x56029d65a040) at ../lib/libfrr.c:1198
Azure#14 0x000056029b6ac317 in main (argc=9, argv=0x7ffe8e5540d8) at ../zebra/main.c:478
```
##### Work item tracking
- Microsoft ADO **(number only)**:
#### How I did it
Added patch.
#### How to verify it
Running BGP tests.
<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->
#### Which release branch to backport (provide reason below if selected)
<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->
- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305
#### Tested branch (Please provide the tested image version)
<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->
- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->
#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
#### A picture of a cute animal (not mandatory but encouraged)
Collaborator
Author
|
Original PR: sonic-net/sonic-buildimage#21095 |
Merged
11 tasks
Javier-Tan
pushed a commit
to Javier-Tan/sonic-buildimage-msft
that referenced
this pull request
Jan 8, 2025
… automatically (#20829) #### Why I did it src/sonic-platform-common ``` * bbbbfc6 - (HEAD -> 202405, origin/202405) Refactor parse_virtium_info to support new ssd model (Azure#495) (31 hours ago) [Yuanzhe] ``` #### How I did it #### How to verify it #### Description for the changelog
yutongzhang-microsoft
pushed a commit
to yutongzhang-microsoft/sonic-buildimage-msft
that referenced
this pull request
Jan 23, 2025
… automatically (#20599) #### Why I did it src/sonic-platform-common ``` * 912ceb3 - (HEAD -> master, origin/master, origin/HEAD) Refactor parse_virtium_info to support new ssd model (Azure#495) (21 hours ago) [Yuanzhe] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
to mssonicbld/sonic-buildimage-msft
that referenced
this pull request
Jul 11, 2025
…tomatically (#23286) #### Why I did it src/sonic-linux-kernel ``` * 45c94db - (HEAD -> 202305, origin/202305) [build] Use package.trafficmanager instead of sonicstorage.blob (Azure#495) (71 minutes ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
bingwang-ms
pushed a commit
that referenced
this pull request
Jan 16, 2026
…lly (#23750) #### Why I did it src/sonic-gnmi ``` * 8d1b029 - (HEAD -> master, origin/master, origin/HEAD) Add v2r mapping for Switch Packet Integrity Drop counter (#423) (10 hours ago) [Vineet Mittal] * 4267aab - Downgrade Go to 1.19 for SONiC Bookworm FIPS compliance (#495) (5 days ago) [Dawei Huang] * 56d0703 - Add dom and port options for SHOW client (#493) (8 days ago) [Yutong Zhang] * 6c7432c - change the output fornat of show interface errors and show interface fec status to be list of dicts (#494) (8 days ago) [Changrong Wu] * ee84ea0 - Fix ZMQ lost data when connection reset issue (#492) (9 days ago) [Hua Liu] ``` #### How I did it #### How to verify it #### Description for the changelog
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why I did it
Adding the below fix from FRR FRRouting/frr#17297
This is to fix the following crash which is a statistical issue
Work item tracking
How I did it
Added patch.
How to verify it
Running BGP tests.
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)