[AS4630-54PE] Apply community PR#13
Merged
bryan1978 merged 1 commit intoedge-core:202211.0from Dec 5, 2023
Merged
Conversation
bryan1978
pushed a commit
that referenced
this pull request
Feb 29, 2024
… (#16550) #### Why I did it src/dhcpmon ``` * 7c55e50 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request #13 from jcaiMR/dev/jcai_master_interface_counter (7 days ago) [StormLiangMS] * 085a087 - refine counting logic (10 days ago) [jcaiMR] * de96a98 - Merge branch 'master' into dev/jcai_master_interface_counter (11 days ago) [jcaiMR] * 5cb4468 - dhcp per-interface counter init commit (12 days ago) [jcaiMR] ``` #### How I did it #### How to verify it #### Description for the changelog
bryan1978
pushed a commit
that referenced
this pull request
Jan 17, 2025
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log 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 #1 0x00007fccd7302fb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x00007fccd72ed472 in abort () from /lib/x86_64-linux-gnu/libc.so.6 #3 0x00007fccd75bb3a9 in _zlog_assert_failed (xref=xref@entry=0x7fccd7652380 <_xref.16>, extra=extra@entry=0x0) at ../lib/zlog.c:678 #4 0x00007fccd759b2fe in route_node_delete (node=<optimized out>) at ../lib/table.c:352 #5 0x00007fccd759b445 in route_unlock_node (node=0x0) at ../lib/table.h:258 #6 route_next (node=<optimized out>) at ../lib/table.c:436 #7 route_next (node=node@entry=0x56029d89e560) at ../lib/table.c:410 #8 0x000056029b6b6b7a in if_lookup_by_name_per_ns (ns=ns@entry=0x56029d873d90, ifname=ifname@entry=0x7fccc0029340 "PortChannel1020") at ../zebra/interface.c:312 #9 0x000056029b6b8b36 in zebra_if_dplane_ifp_handling (ctx=0x7fccc0029310) at ../zebra/interface.c:1867 #10 zebra_if_dplane_result (ctx=0x7fccc0029310) at ../zebra/interface.c:2221 #11 0x000056029b7137a9 in rib_process_dplane_results (thread=<optimized out>) at ../zebra/zebra_rib.c:4810 #12 0x00007fccd75a0e0d in thread_call (thread=thread@entry=0x7ffe8e553cc0) at ../lib/thread.c:1990 #13 0x00007fccd7559368 in frr_run (master=0x56029d65a040) at ../lib/libfrr.c:1198 #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)
vincentchiang-ec
pushed a commit
that referenced
this pull request
Apr 6, 2026
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 #1 0x00007fccd7302fb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x00007fccd72ed472 in abort () from /lib/x86_64-linux-gnu/libc.so.6 #3 0x00007fccd75bb3a9 in _zlog_assert_failed (xref=xref@entry=0x7fccd7652380 <_xref.16>, extra=extra@entry=0x0) at ../lib/zlog.c:678 #4 0x00007fccd759b2fe in route_node_delete (node=<optimized out>) at ../lib/table.c:352 #5 0x00007fccd759b445 in route_unlock_node (node=0x0) at ../lib/table.h:258 #6 route_next (node=<optimized out>) at ../lib/table.c:436 #7 route_next (node=node@entry=0x56029d89e560) at ../lib/table.c:410 #8 0x000056029b6b6b7a in if_lookup_by_name_per_ns (ns=ns@entry=0x56029d873d90, ifname=ifname@entry=0x7fccc0029340 "PortChannel1020") at ../zebra/interface.c:312 #9 0x000056029b6b8b36 in zebra_if_dplane_ifp_handling (ctx=0x7fccc0029310) at ../zebra/interface.c:1867 #10 zebra_if_dplane_result (ctx=0x7fccc0029310) at ../zebra/interface.c:2221 #11 0x000056029b7137a9 in rib_process_dplane_results (thread=<optimized out>) at ../zebra/zebra_rib.c:4810 #12 0x00007fccd75a0e0d in thread_call (thread=thread@entry=0x7ffe8e553cc0) at ../lib/thread.c:1990 #13 0x00007fccd7559368 in frr_run (master=0x56029d65a040) at ../lib/libfrr.c:1198 #14 0x000056029b6ac317 in main (argc=9, argv=0x7ffe8e5540d8) at ../zebra/main.c:478
vincentchiang-ec
pushed a commit
that referenced
this pull request
Apr 6, 2026
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log 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 The bullseye-backports section of the repo has been removed from the main repo. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### How to verify it Verified by attempting to build slave container: ``` #13 0.522 Get:1 http://archive.debian.org/debian bullseye InRelease [116 kB] #13 0.538 Get:2 http://archive.debian.org/debian bullseye-updates InRelease [44.0 kB] #13 0.538 Get:3 http://archive.debian.org/debian bullseye-backports InRelease [48.9 kB] #13 0.568 Get:4 http://debian-archive.trafficmanager.net/debian-security bullseye-security InRelease [27.2 kB] #13 0.737 Get:5 http://archive.debian.org/debian bullseye/contrib Sources [43.2 kB] #13 0.915 Get:6 http://archive.debian.org/debian bullseye/main Sources [8500 kB] #13 1.037 Get:7 http://debian-archive.trafficmanager.net/debian-security bullseye-security/contrib Sources [1128 B] #13 1.065 Get:8 http://debian-archive.trafficmanager.net/debian-security bullseye-security/main Sources [250 kB] #13 1.133 Get:9 http://debian-archive.trafficmanager.net/debian-security bullseye-security/non-free Sources [1352 B] #13 1.134 Get:10 http://debian-archive.trafficmanager.net/debian-security bullseye-security/main amd64 Packages [389 kB] #13 1.157 Get:11 http://debian-archive.trafficmanager.net/debian-security bullseye-security/contrib amd64 Packages [2880 B] #13 1.157 Get:12 http://debian-archive.trafficmanager.net/debian-security bullseye-security/non-free amd64 Packages [1184 B] #13 1.280 Get:13 http://archive.debian.org/debian bullseye/non-free Sources [81.0 kB] #13 1.605 Get:14 http://archive.debian.org/debian bullseye/contrib amd64 Packages [50.4 kB] #13 1.609 Get:15 http://archive.debian.org/debian bullseye/main amd64 Packages [8066 kB] #13 1.662 Get:16 http://archive.debian.org/debian bullseye/non-free amd64 Packages [96.4 kB] #13 1.662 Get:17 http://archive.debian.org/debian bullseye-updates/main Sources [7908 B] #13 1.663 Get:18 http://archive.debian.org/debian bullseye-updates/main amd64 Packages [18.8 kB] #13 1.663 Get:19 http://archive.debian.org/debian bullseye-backports/non-free amd64 Packages [14.4 kB] #13 1.663 Get:20 http://archive.debian.org/debian bullseye-backports/main amd64 Packages [403 kB] #13 1.665 Get:21 http://archive.debian.org/debian bullseye-backports/contrib amd64 Packages [6164 B] #13 2.755 Fetched 18.2 MB in 2s (8066 kB/s) #13 2.755 Reading package lists... #13 3.212 Reading package lists... #13 3.626 Building dependency tree... #13 3.709 Reading state information... ``` <!-- 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 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 #### 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)
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
[AS4630-54PE] Apply community PR
Apply community PR :
sonic-net/sonic-buildimage#11593
sonic-net/sonic-buildimage#11716
sonic-net/sonic-buildimage#14361
Detail:
as4630-54pe already merge(at commit id: 4be14f0) the PRs below:
sonic-net/sonic-buildimage#12636
sonic-net/sonic-buildimage#12863
sonic-net/sonic-buildimage#12863
sonic-net/sonic-buildimage#13241
sonic-net/sonic-buildimage#13288
sonic-net/sonic-buildimage#15002
sonic-net/sonic-buildimage#13848
sonic-net/sonic-buildimage#13474
sonic-net/sonic-buildimage#13475
sonic-net/sonic-buildimage#13476
sonic-net/sonic-buildimage#13477
sonic-net/sonic-buildimage#13685
sonic-net/sonic-buildimage#14475
sonic-net/sonic-buildimage#14993
sonic-net/sonic-buildimage#14919
sonic-net/sonic-buildimage#15461
sonic-net/sonic-buildimage#16114
sonic-net/sonic-buildimage#334
How I did it
How to verify it
Which release branch to backport (provide reason below if selected)
Description for 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
A picture of a cute animal (not mandatory but encouraged)