[code sync] Merge code from sonic-net/sonic-buildimage:202511 to 202512#2005
Merged
mssonicbld merged 7 commits intoAzure:202512from Feb 20, 2026
Merged
[code sync] Merge code from sonic-net/sonic-buildimage:202511 to 202512#2005mssonicbld merged 7 commits intoAzure:202512from
mssonicbld merged 7 commits intoAzure:202512from
Conversation
Collaborator
mssonicbld
commented
Feb 20, 2026
mssonicbld
commented
…atically (#25250) #### Why I did it src/sonic-utilities ``` * 0315da21 - (HEAD -> 202511, origin/202511) [LACP retry-count] Syntax Fix for Trixie (#4280) (6 hours ago) [Yair Raviv] * 4420954e - Fix dump port state CLI command crash on multi-asic platforms (#4276) (5 days ago) [mssonicbld] * a3ad30be - [Mellanox] Add restricted sysfs list for fw control modules (#4202) (13 days ago) [mssonicbld] * 16390921 - Fix j2 files not getting packaged (#4252) (13 days ago) [mssonicbld] * 6b9b0dce - [hft]: HFT config/show cli (#4243) (2 weeks ago) [mssonicbld] * 529b6479 - [sfputil] Fix issue: should not do low power mode or reset for non-present ports (#4241) (2 weeks ago) [mssonicbld] * ad70c8f2 - Update bash completions for sonic-utilities commands (#4234) (3 weeks ago) [mssonicbld] * 667f4b32 - [202511][GCU] Update WRED_PROFILE and BUFFER_POOL validators for GCU (#4226) (3 weeks ago) [Dev Ojha] * 88b3899d - Fix sonic-kdump-config for running commands with pipe (#4220) (3 weeks ago) [mssonicbld] * e4881b02 - Skip IP range duplicate check in validate_bgp_peer_group for different vnets (#4215) (4 weeks ago) [mssonicbld] * 9c24925a - Fix syntax and semantic errors in kdump remote feature (#4212) (4 weeks ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…lly (#25405) #### Why I did it src/sonic-swss ``` * 13227d02 - (HEAD -> 202511, origin/202511) [countersyncd]: Add communication statistics recording and utilities (#4222) (2 days ago) [mssonicbld] * 3c4d3b2b - [countersyncd]: Add retry between client and otel collector (#4220) (3 days ago) [mssonicbld] * 77acf5a0 - [countersyncd] fix otel actor log level (#4221) (3 days ago) [mssonicbld] * 03ec77c7 - [countersyncd]: Add benchmark suite for countersyncd and optimize otel actor (#4216) (5 days ago) [mssonicbld] * 08050f2e - [hft]: Fix TAM type capability enable list (#4215) (6 days ago) [mssonicbld] * d0793b45 - [Fixbug]: Fix delete default HFT configuration issue (#4138) (7 days ago) [mssonicbld] * 246d9575 - [hft]: Enable output queue for HFT (#4187) (7 days ago) [mssonicbld] * ae6a9887 - [countersyncd]: Fix netlink fd leakage and deadlock issue (#4191) (7 days ago) [mssonicbld] * c468e1fc - [countersyncd]: Fix compiling warning of otel (#4192) (7 days ago) [mssonicbld] * d675062c - Enabling the FEC histogram for gbsyncd counters (#4195) (9 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
Signed-off-by: Deepak Singhal <deepsinghal@microsoft.com>
…PU reboot (#25578) <!-- 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: --> reference: https://github.com/sonic-net/sonic-buildimage/blob/master/src/sonic-yang-models/yang-models/sonic-device_metadata.yang#L197 #### Why I did it For sonic-net/SONiC#2175 sign-off: Jing Zhang zhangjing@microsoft.com ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it 1. Check if DPU_APPL_DB is pingable 2. If yes, flush all DB entries when swss starts. #### How to verify it Tested on ssw testbed. - Entries got removed. ``` $ redis-cli -p 6381 -n 15 127.0.0.1:6381[15]> keys * 1) "BFD_SESSION_TABLE:default:default:10.1.0.32" 2) "BFD_SESSION_TABLE:default:default:10.1.2.32" 3) "BFD_SESSION_TABLE:default:default:10.1.1.32" 127.0.0.1:6381[15]> keys * (empty array) ``` ``` $ redis-cli -p 6381 MONITOR OK ... ... 1769395816.952661 [18 169.254.200.1:34286] "PING" 1769395816.952718 [16 169.254.200.1:34280] "PING" 1769395816.954712 [17 169.254.200.1:34296] "SELECT" "17" 1769395816.954877 [17 169.254.200.1:34296] "PING" 1769395817.183169 [15 169.254.200.1:34310] "SELECT" "15" 1769395817.183386 [15 169.254.200.1:34310] "PING" 1769395817.210425 [15 169.254.200.1:34320] "SELECT" "15" 1769395817.210602 [15 169.254.200.1:34320] "FLUSHDB" 1769395817.229074 [17 169.254.200.1:34322] "SELECT" "17" 1769395817.229309 [17 169.254.200.1:34322] "FLUSHDB" ``` <!-- 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 --> - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [ ] 202511 #### 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)
….j2 (#25582) #### Why I did it Fix #25261 `config feature state otel enabled` fails with `Feature 'otel' doesn't exist`. Without the FEATURE table entry, users cannot enable/disable the OTEL collector via CLI. #### How I did it * Added the otel feature entry to `files/build_templates/init_cfg.json.j2` with default state set to disabled * The feature is only added to the FEATURE table when `INCLUDE_SYSTEM_OTEL=y` is set at build time; otherwise no entry is created Note: Since the default state is disabled, existing deployments are unaffected and users must explicitly run `config feature state otel enabled` to activate the container. This ensures backward compatibility as the change is opt-in only and follows the same pattern as other disabled-by-default optional features. #### How to verify it 1. Build a SONiC image with `INCLUDE_SYSTEM_OTEL=y` 2. Boot the image and run `show feature status otel` - should show the feature exists 3. Run `sudo config feature state otel enabled` - should succeed without error 4. Run `show feature status otel` - should show state as enabled #### Description for the changelog Add otel feature to FEATURE table to enable CLI configuration of the OTEL collector container
…nt to the latest HEAD (#25584) Signed-off-by: Tejaswini Chadaga <tchadaga@microsoft.com>
Collaborator
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
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
3 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.