Fix conflict in .gitmodule when merging 202411 branch.#523
Merged
liushilongbuaa merged 11 commits into202412from Jan 17, 2025
Merged
Fix conflict in .gitmodule when merging 202411 branch.#523liushilongbuaa merged 11 commits into202412from
liushilongbuaa merged 11 commits into202412from
Conversation
…atically (#21169) [submodule][202411] Update submodule sonic-utilities to the latest HEAD automatically
FRR 10.0.1 upgrade (#20269) brought in a mgmtd daemon for FRR. This needs to be started up in docker-sonic-vs as part of the other daemons in this container. Additionally, Debian Bookworm provides version 2.5.0 of scapy, but the pip3 command later in the file downgraded it to 2.4.5, which does not work in Bookworm. Fix this by removing the pip3 installation for scapy, and updating the other packages installed via pip3. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Initial 202411 release Signed-off-by: Anand Mehra anamehra@cisco.com
Why I did it dhcp_relay/test_dhcp_relay_stress.py::test_dhcp_relay_stress[offer|ack] tests are failing on dualtor topologies with signature Failed: /tmp/dhcp_stress_test_offer.json is missing, see issue aristanetworks/sonic-qual.msft#325 for more details. Work item tracking Microsoft ADO (number only): How I did it count_matched_packets method is getting stuck in a while loop as long as ptf server port receives any packet (Ex: in dualtor case, we do see continuous ICMP packets on ptf port). Fix is to consider only expected packets w.r.t timeout (similar to count_matched_packets_all_ports logic). How to verify it With this PR changes we should not see dhcp_relay/test_dhcp_relay_stress.py failures on dualtor topologies with symptom Failed: /tmp/dhcp_stress_test_offer.json is missing.
…tically (#21302) [submodule] Update submodule sonic-sairedis to the latest HEAD automatically
…ly (#21301) [submodule][202411] Update submodule dhcprelay to the latest HEAD
… (#21300) [submodule][202411] Update submodule dhcpmon to the latest HEAD
[202411]Adding sonic_version file
…n high CPU utilization scenario (#21349) <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_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 Fix sonic-net/sonic-buildimage#21314 Update and prolong the timeout of the requests between snmpd and SNMP AgentX. In SONiC SNMP AgentX, the MIB updaters and AgentX client shares the same AsyncIO/Coroutine event loop. During the MIB updaters update the SNMP values, the AgentX client can't respond to the snmpd request. The default value of snmpd request is 1s(timeout) failure_prs.log 5(retries) When the CPU is high, the MIB updaters are slow, 1s timeout is not enough, even if it retries 5 times. Hence update to 5s(timeout) failure_prs.log 4(retries), the time windows = 20s, which makes sure the SNMP request can be handled even with 100% CPU utilization. ##### Work item tracking - Microsoft ADO **30112399**: #### How I did it Update the default value(https://linux.die.net/man/5/snmpd.conf): agentXTimeout 1(default value) -> 5 agentXRetries 5(default value) -> 4 #### How to verify it <!-- 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. --> Test on Cisco chassis, test_snmp_cpu.py which triggers 100% CPU utilization test whether snmp requests work well. #### 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 - [x] 202405 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [x] 202405 - [ ] <!-- 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)
prabhataravind
pushed a commit
that referenced
this pull request
Jul 7, 2025
… automatically (#21217) #### Why I did it src/sonic-platform-common ``` * 9ca0f69 - (HEAD -> master, origin/master, origin/HEAD) Update azure pipeline to use Bookworm (#523) (13 hours ago) [Saikrishna Arcot] ``` #### 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 (#24314) #### Why I did it src/sonic-gnmi ``` * 072f3a4 - (HEAD -> master, origin/master, origin/HEAD) gNOI file remove: add handler & tests; update builder and main (#520) (28 hours ago) [ravaliyel] * d79245b - Implements complete firmware file listing through gNMI interface with… (#523) (29 hours ago) [v-cshekar] ``` #### How I did it #### How to verify it #### Description for the changelog
theasianpianist
added a commit
that referenced
this pull request
Feb 17, 2026
<!--
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
```
* d279a66 - (HEAD -> 202506, origin/202506) [202506 gnmi cherry pick/dpu upstream (#159) (14 hours ago) [Prince Sunny]
* a0e898d - just to rerun pipeline (3 days ago) [Dawei Huang]
* 3bf204b - [action] [PR:563] [ssw][ha] use ProducerStateTable for DASH_HA_ tables. (#160) (8 days ago) [mssonicbld]
* 7428f00 - Add independent DPU upgrade support via gNOI streaming operations (#532) (10 days ago) [Dawei Huang]
* 1556ccc - gNOI Debug Service Implementation (#524) (10 days ago) [Dawei Huang]
* cf09c56 - Implement gNOI File.TransferToRemote with HTTP and MD5 support (#521) (10 days ago) [Dawei Huang]
* a6eb6cf - Fix pure.mk CI and add early validation to Azure pipeline (#529) (10 days ago) [Dawei Huang]
* 5f27f62 - Implements complete firmware file listing through gNMI interface with… (#523) (10 days ago) [Dawei Huang]
* e2e34d7 - Add support for gNOI File Services (#406) (2 weeks ago) [Dawei Huang]
* c2bb88e - [action] [PR:516] Add operational handler with disk space query (#151) (2 weeks ago) [mssonicbld]
```
##### Work item tracking
- Microsoft ADO **(number only)**:
#### How I did it
#### How to verify it
<!--
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
#### 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)
liushilongbuaa
pushed a commit
that referenced
this pull request
Mar 25, 2026
…tomatically (#24990) #### Why I did it src/sonic-linux-kernel ``` * e7fea60 - (HEAD -> master, origin/master, origin/HEAD) update docker slave name (#523) (3 days ago) [yijingyan2] * b363a5b - Add tpm_tis_i2c driver module for arm64 (#524) (3 days ago) [Pavan Prakash] ``` #### 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
7 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
Work item tracking
How I did it
How to verify it
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)