Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#242

Merged
mssonicbld merged 5 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge
Feb 1, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#242
mssonicbld merged 5 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge

Conversation

@mssonicbld
Copy link
Collaborator

* 7c88542d6 - (head/202305) Disable eventd and rsyslog plugin in slim images (#17905) (#17972) (2024-02-01) [Zain Budhwani]
* 15a0f912b - [Mellanox] Disable SSD NCQ on Mellanox platforms (#17567) (2024-02-01) [Volodymyr Samotiy]
* 2a8181c88 - [staticroutebfd] fix an error in error logging (#17043) (2024-02-01) [Baorong Liu]
* 4efd51054 - [202305][Mellanox]Update SDK/FW to 4.6.2202/2012.2202 (#17946) (2024-01-31) [Sudharsan Dhamal Gopalarathnam]<br>```

dgsudharsan and others added 5 commits January 31, 2024 13:33
Why I did it
Update SDK/FW version to 4.6.2202/2012.2202
Fixed issues

On Spectrum-3 systems, ports' toggling while sending traffic on 400G speed ports, might result in stuck FW.
In Spectrum-1 switch systems, 50G SR2 speed mode is not supported when AutoNeg is enabled. In this case although the max interface speed is 50G for SR2 or SR4 or SR, the actual max interface speed negotiated between the loopback is 25G.
On Spectrum-2 and Spectrum-3, Switch create in fastboot might take more than 40 seconds in case there are no active links.
When performing warmboot from version prior to 202205 to 202205 and above , no aging and mac move take place
Work item tracking
Microsoft ADO (number only):
How I did it
Updating make files.

How to verify it
Running regression
Why I did it
Fix an error in the log_err call.
this error can be triggered by an invalid static route key. usually the code cannot go here with normal config file. but hit this issue with an invalid key by manual testing with redis-cli directly. the file is scanned by Python lint to prevent such errors.

Work item tracking
Microsoft ADO ():26250268

How I did it
fix the format error.

How to verify it
1, ran pylint to check the design, make sure no such error in the design file.
2, wrote a separate python program to verify the log call.
In the current logging related testing, usually use patch/mock for logging. for this specific error, could not trigger it if we call mock function instead the real function in the design. so need to do lint checking for code change.
- Why I did it
Based on some research some products might experience an occasional IO failures in the communication between CPU and SSD because of NCQ.
There seems to be a problem between some kernel versions and some SATA controllers.

Syslog error message examples:

Error "ata1: SError: { UnrecovData Handshk }" - "failed command: WRITE FPDMA QUEUED".
Error "ata1: SError: { RecovComm HostInt PHYRdyChg CommWake 10B8B DevExch }" - "failed command: READ FPDMA QUEUED".
Some vendors already disabled NCQ on their platforms in SONiC due to similar issue:

[Arista] Disable ATA NCQ for a few products #13739 [Arista] Disable ATA NCQ for a few products
[Arista] Disable SSD NCQ on DCS-7050CX3-32S #13964 [Arista] Disable SSD NCQ on DCS-7050CX3-32S
Also there are other discussions on Debian/Ubuntu forums about similar issues and it was suggested to disable NCQ:

https://askubuntu.com/questions/133946/are-these-sata-errors-dangerous

- How I did it
Add a kernel parameter to tell libata to disable NCQ

- How to verify it
Use FIO tool - fio --direct=1 --rw=randrw --bs=64k --ioengine=libaio --iodepth=64 --runtime=120 --numjobs=4
Disable eventd at buildtime for slim images

- Microsoft ADO **(number only)**:26386286

Add flags for disabling eventd and only copy rsyslog conf files when eventd is included and not slim image

Manual testing
@mssonicbld mssonicbld merged commit cdc4de3 into Azure:202305 Feb 1, 2024
r12f pushed a commit that referenced this pull request Dec 19, 2024
…lly (#19460)

#### Why I did it
src/sonic-gnmi
```
* 7801415 - (HEAD -> master, origin/master, origin/HEAD) Use server GracefulStop instead of force stop (#219) (3 days ago) [Zain Budhwani]
* 7631184 - make save on set only when err is nil (#242) (3 days ago) [Ryan Lucus]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
…utomatically (#22660)

#### Why I did it
src/sonic-host-services
```
* 0206da1 - (HEAD -> 202505, origin/202505) Revert "[featured] fix non existing feature start (#234)" (#273) (51 minutes ago) [mssonicbld]
* d4d624e - Add iptables rules to drop all bgp packets destined for loopback1 IP addresses in dual ToR (#269) (10 days ago) [mssonicbld]
* 93db579 - Fix PyGObject required version (#265) (2 weeks ago) [mssonicbld]
* 112acad - [build] Update Azure pipeline to use Ubuntu 24.04 image (#266) (2 weeks ago) [mssonicbld]
* 1ee792e - Implement Download and Delete For File Service (#242) (5 weeks ago) [Dawei Huang]
* 00393e3 - [kdump-config] Update kdump default config with pre-defined value in /proc/cmdline (installer.conf) (#237) (7 weeks ago) [Marty Y. Lok]
* d028745 - [Radius] Add require_message_authenticator option to fix BlastRadius issue. (#172) (7 weeks ago) [Julian Chang]
* 8237b5d - Monitor rsyslog feature flag change and update rsyslog config by restart rsyslog-config service (#245) (7 weeks ago) [Hua Liu]
* 55cee71 - Improve Detection Logic for HALT Command in is_halt_command_running() (#247) (8 weeks ago) [Vasundhara Volam]
* 29b8be8 - [featured] fix non existing feature start (#234) (3 months ago) [Stepan Blyshchak]
* fe90cb1 - Adding support for filtering by destination IP and/or incoming interface to caclmgrd. (#195) (3 months ago) [nyanto]
* 6006e05 - caclmgrd interface rules patch 1 (#197) (3 months ago) [Nanma Purushotam]
* 3ba0c59 - Pin PyGObject to 3.50.0 (#228) (3 months ago) [cpackham-atlnz]
* 5445cf6 - Radius Access request to use configured src interface (#230) (3 months ago) [lakshmi-nexthop]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Sep 20, 2025
…AD automatically (#1643)

#### Why I did it
src/sonic-utilities
```
* 6d69d1f2 - (HEAD -> 202506, origin/202506) Merge pull request #242 from mssonicbld/sonicbld/202506-merge (23 hours ago) [mssonicbld]
* b1248a00 - Merge branch '202505' of https://github.com/sonic-net/sonic-utilities into 202506 (23 hours ago) [Sonic Automation]
* 661ac611 - DOM for flat memory transceiver modules (#4063) (24 hours 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
…utomatically (#22160)

#### Why I did it
src/sonic-host-services
```
* aa971f6 - (HEAD -> master, origin/master, origin/HEAD) Revert "[featured] fix non existing feature start (#234)" (#272) (29 hours ago) [Qi Luo]
* 04e49f8 - Add iptables rules to drop all bgp packets destined for loopback1 IP addresses in dual ToR (#262) (11 days ago) [Yawen]
* 727e21b - [Caclmgrd]Fix key error issue about acl_source_ip_map (#268) (11 days ago) [Changrong Wu]
* 4cb6b97 - Restart caclmgrd whenever catch exception in child thread or in main thread (#194) (13 days ago) [Zhaohui Sun]
* d7842aa - config_db should not mandate True and False for featured (#252) (2 weeks ago) [Brad House - NextHop]
* 70de4d1 - Fix PyGObject required version (#264) (3 weeks ago) [Qi Luo]
* 953816b - Modify cacl rules to allow incoming packets to dash-ha (#256) (3 weeks ago) [yue-fred-gao]
* 5460c29 - Improve reboot status tracking and add reboot count & method to status (#259) (3 weeks ago) [Vasundhara Volam]
* e46e36e - Update ubuntu version in azure pipeline (#260) (4 weeks ago) [Vasundhara Volam]
* 23b81f9 - Fix reboot without message (#250) (4 weeks ago) [jkmar]
* 1ee792e - Implement Download and Delete For File Service (#242) (5 weeks ago) [Dawei Huang]
* 00393e3 - [kdump-config] Update kdump default config with pre-defined value in /proc/cmdline (installer.conf) (#237) (7 weeks ago) [Marty Y. Lok]
* d028745 - [Radius] Add require_message_authenticator option to fix BlastRadius issue. (#172) (7 weeks ago) [Julian Chang]
* 8237b5d - Monitor rsyslog feature flag change and update rsyslog config by restart rsyslog-config service (#245) (8 weeks ago) [Hua Liu]
* 55cee71 - Improve Detection Logic for HALT Command in is_halt_command_running() (#247) (8 weeks ago) [Vasundhara Volam]
* 29b8be8 - [featured] fix non existing feature start (#234) (3 months ago) [Stepan Blyshchak]
* fe90cb1 - Adding support for filtering by destination IP and/or incoming interface to caclmgrd. (#195) (3 months ago) [nyanto]
* 6006e05 - caclmgrd interface rules patch 1 (#197) (3 months ago) [Nanma Purushotam]
* 3ba0c59 - Pin PyGObject to 3.50.0 (#228) (3 months ago) [cpackham-atlnz]
* 5445cf6 - Radius Access request to use configured src interface (#230) (3 months ago) [lakshmi-nexthop]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants