Skip to content

202205 1#29

Closed
gechiang wants to merge 21 commits intoAzure:202205from
gechiang:202205-1
Closed

202205 1#29
gechiang wants to merge 21 commits intoAzure:202205from
gechiang:202205-1

Conversation

@gechiang
Copy link
Contributor

@gechiang gechiang commented Jun 9, 2023

Why I did it

merge from sonic-net/sonic-buildimage 202205 branch to azure/sonic-buildimage-msft 202205

af47583 (public/202205) Added change to add 'peerType' as element in NEIGH_STATE_TABLE. (#15265) (#15381)
ffd062a updated internal route policy for chassis-packet (#15349) (#15378)
bd323a8 [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#15372)
dc6b6bb [submodule] Update submodule sonic-telemetry to the latest HEAD automatically (#15373)
dfee3f3 [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15367)
77f2893 [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15366)
fbe5fe7 [ci/build]: Upgrade SONiC package versions (#15326)
4d91f68 [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15347)
ba39275 [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15344)
f1542a9 [submodule] Update submodule linkmgrd to the latest HEAD automatically (#15324)
eb2e342 [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15320)
49700d3 [submodule] Update submodule sonic-swss to the latest HEAD automatically (#15319)
fdf3aac [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15318)
b0abe71 Fix for fast/cold-boot: call db_migrator only after old config is loaded (#14933) (#15316)
7a3fc7a [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15238)
695505c [action] Only add 'automerge' label on master version upgrade PR. (#15112) (#15279)
33359b4 [submodule] Update submodule sonic-swss to the latest HEAD automatically (#15237)
723c508 Update PG headroom settings ports based on port speed/cable length (#15287)
feb8671 [202205] Implement zram compression for docker in RAM (#15137)
336697d [CI/CD] Refine pr test definition, remove old test jobs and testbedv2 flags (#15304)

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106

Description for the changelog

A picture of a cute animal (not mandatory but encouraged)

yejianquan and others added 21 commits June 2, 2023 16:33
* [Arista] Fix boot0 code for docker_inram

Enable docker_inram for all systems with 4GB or less of flash.
This is mandatory to allow these systems to store 2 SONiC images.

This change also fixes the missing docker_inram attribute when
installing a new image from SONiC.
Because the SWI image can ship with additional kernel parameters within
such as `sonic_fips=` this lead to a conflict.
To prevent the conflict, the extra kernel parameters from the SWI are
now stored in the file `kernel-cmdline-append` which isn't used anywhere.

* Add optional zram compression for docker_inram

Some devices running SONiC have a small storage device (2G and 4G mainly)
The SONiC image growth over time has made it impossible to install
2 images on a single device.
Some mitigations have been implemented in the past for some devices but
there is a need to do more.

One such mitigation is `docker_inram` which creates a `tmpfs` and
extracts `dockerfs.tar.gz` in it.
This all happens in the SONiC initramfs and by ensuring the installation
process does not extract `dockerfs.tar.gz` on the flash but keep the file as is.

This mitigation does a tradeoff by using more RAM to reduce the disk footprint.
It however creates new issues for devices with 4G of system memory since
the extracted `dockerfs.tar.gz` nears the 1.6G.
Considering debian upgrades (with dual base images) and the continuous
stream of features this is only going to get bigger.

This change introduces an alternative to the `tmpfs` by allowing a system
to extract the `dockerfs.tar.gz` inside a `zram` device thus bringing
compression in play at the detriment of performance.

Introduce 2 new optional kernel parameters to be consumed by SONiC initramfs.
 - `docker_inram_size` which represent the max physical size of the
   `zram` or `tmpfs` volume (defaults to DOCKER_RAMFS_SIZE)
 - `docker_inram_algo` which is the method to use to extract the
   `dockerfs.tar.gz` (defaults to `tmpfs`)
   other values are considered to be compression algorithm for `zram`
   (e.g `zstd`, `zlo-rle`, `lz4`)

Refactored the logic to mount the docker fs in the SONiC initramfs under
the `union-mount` script.
Moved the code into a function to make it cleaner and separated the
inram volume creation and docker extraction.

On Arista platform with a flash smaller or equal to 4GB set
`docker_inram_algo` to `zstd` which produces the best compression ratio
at the detriment of a slower write performance and a similar read
performance to other `zram` compression algorithms.
…15287)

Why I did it
Update cable length for uplink/downlink ports for chassis and and update PG/pool headroom size accordingly.

Work item tracking
17880812

How I did it
Updated cable length as well as buffer config in HWSKU files.
…lly (#15237)

src/sonic-swss

* 4d9fb93 - (HEAD -> 202205, origin/202205) [orchagent][neighorch] traffic convergence acceleration for staticroutebfd (#2769) (6 days ago) [Baorong Liu]
* 43c88a3 - Fix pipeline issue caused by urllib3 v2 (6 days ago) [Liu Shilong]
…5112) (#15279)

Why I did it
Don't auto update package version for release branch.

Work item tracking
Microsoft ADO (number only): 22335854
How I did it
How to verify it
…atically (#15238)

src/sonic-utilities

* cd08aa69 - (HEAD -> 202205, origin/202205) [show][muxcable] add some new commands health, reset-cause, queue_info support for muxcable (#2853) (2 days ago) [vdahiya12]
* 4b96bd7e - Update pcieutil error message on loading common pcie module (#2786) (6 days ago) [cytsao1]
* 77b725ca - Fix the show interface counters throwing exception on device with no external interfaces (#2851) (6 days ago) [abdosi]
…D automatically (#15318)

src/sonic-platform-daemons

* 616f13f - (HEAD -> 202205, origin/202205) [ycabled] fix bug for `show mux status` delayed response (#364) (6 hours ago) [vdahiya12]
…lly (#15319)

src/sonic-swss

* c781521 - (HEAD -> 202205, origin/202205) [swss][orchagent] fix srt-bfd ut (#2803) (6 hours ago) [Baorong Liu]
…atically (#15320)

src/sonic-utilities

* ec472146 - (HEAD -> 202205, origin/202205) fix show interface neighbor expected empty issue (#2465) (3 minutes ago) [jcaiMR]
* d1f4413c - [vlan][dhcp_relay] Clear dhcpv6 relay counter while deleting vlan (#2852) (6 hours ago) [Yaqiang Zhu]
* 051f28ce - [db-migrator] Fix hwsku match for 6100 and add errors when hwsku is None (#2821) (7 hours ago) [Vaibhav Hemant Dixit]
…y (#15324)

src/linkmgrd

* c0f7c50 - (HEAD -> 202205, origin/202205) Increase verbosity for mux config and default route handlers (#193) (14 minutes ago) [Longxiang Lyu]
* 2040a5e - Ignore mux probe unknown for health calculation (#188) (14 minutes ago) [Longxiang Lyu]
…D automatically (#15344)

src/sonic-platform-daemons

* 1537d6a - (HEAD -> 202205, origin/202205) [dualtor] Fix command `show mux status` (#371) (2 minutes ago) [Longxiang Lyu]
…D automatically (#15347)

src/sonic-platform-daemons

* a90bff5 - (HEAD -> 202205, origin/202205) [ycabled] correct the wrong function call for 'config hwmode state' (#372) (5 minutes ago) [vdahiya12]
…D automatically (#15366)

src/sonic-platform-daemons

* 18815c7 - (HEAD -> 202205, origin/202205) Revert "[ycabled] refactor code for onboarding async client changes;refactor (#355)" (3 minutes ago) [Ying Xie]
* 5324554 - Revert "add async notification support in active-active topo; refactor code for ycable tasks for change events  (#327)" (3 minutes ago) [Ying Xie]
* cbbe2b5 - Revert "[ycabled] fix bug for `show mux status` delayed response (#364)" (3 minutes ago) [Ying Xie]
* 9746709 - Revert "[dualtor] Fix command `show mux status` (#371)" (3 minutes ago) [Ying Xie]
* 551ab3c - Revert "[ycabled] correct the wrong function call for 'config hwmode state' (#372)" (3 minutes ago) [Ying Xie]
…atically (#15367)

src/sonic-utilities

* 75ca81e4 - (HEAD -> 202205, origin/202205) [202205][config]Support multi-asic Golden Config override with fix (#2825) (#2862) (13 hours ago) [jingwenxie]
…atically (#15373)

src/sonic-telemetry

* 5a83c07 - (HEAD -> 202205, origin/202205) Merge pull request #109 from zbud-msft/backport-202205 (86 minutes ago) [Ying Xie]
* 0f75a64 - [202012] Workaround gomonkey for armhf (#88) (3 weeks ago) [Zain Budhwani]
* 1b0dc75 - Fix Makefile error (3 weeks ago) [Zain Budhwani]
* 72e4540 - Add diff cov (#85) (3 weeks ago) [Zain Budhwani]
* 11aace5 - Add get-update to azp yml (#79) (3 weeks ago) [Zain Budhwani]
* 3eaaccc - Add net core and code coverage results (#77) (3 weeks ago) [Zain Budhwani]
* 3cf3883 - Enable unit test (3 weeks ago) [ganglyu]
* 2a0928f - Change dir name in pipeline (#75) (4 weeks ago) [Zain Budhwani]
* baa845a - Update yml (4 weeks ago) [Zain Budhwani]
* c533d52 - Fix format (4 weeks ago) [ganglyu]
… automatically (#15372)

src/sonic-platform-common

* 4969f70 - (HEAD -> 202205, origin/202205) Skip CDB and VDM for flat memory modules (#281) (2 minutes ago) [Prince George]
@gechiang gechiang requested review from a team, StormLiangMS and lguohan as code owners June 9, 2023 08:04
@gechiang gechiang closed this Jun 9, 2023
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request Jul 5, 2023
Update dhcprelay submodule to include the following commits
4bf1868 fix relay-reply dhcpv6 packet counter issue (Azure#29)
gechiang added a commit that referenced this pull request Sep 30, 2023
[submodule][202205] Update submodule sonic-utilities to the latest HEAD automatically
*   ceced56 - (HEAD -> 202205, origin/202205) Merge pull request #30 from alpeshspatel/alpeshspatel/util.msft.202205.mmuconfig (30 hours ago) [abdosi]
|\  
| * 44dbfde - mmuconfig to set threshold for profiles master#2775 (2 days ago) [Alpesh S Patel]
|/  
* 75030e0 - Merge pull request #29 from mssonicbld/sonicbld/202205-merge (3 days ago) [mssonicbld]
* 7df1c6b - Merge branch '202205' of https://github.com/sonic-net/sonic-utilities into 202205 (3 days ago) [Sonic Automation]
* d9bc820 - Handle NotImplementedError exception while changing optoe write max (#2985) (3 days ago) [mihirpat1]
* 4bf29fe - [sonic-package-manager] Increate timeout for sonic-package-manager migrate (#2973) (3 days ago) [Yaqiang Zhu]
mssonicbld added a commit that referenced this pull request Feb 20, 2025
… automatically (#642)

#### Why I did it
src/sonic-platform-common
```
* 7a5807f - (HEAD -> 202405, origin/202405) [cmis] Optimize cmis.get_error_description speed for passive module (#541) (#29) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 7, 2025
…tomatically (#800)

#### Why I did it
src/sonic-linux-kernel
```
* a1e9e0d - (HEAD -> 202412, origin/HEAD, origin/202412) [code sync] Merge code from sonic-net/sonic-linux-kernel:202411 to 202412 (#29) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 9, 2025
…omatically (#828)

#### Why I did it
src/sonic-swss-common
```
* 3c72691 - (HEAD -> 202412, origin/HEAD, origin/202412) [FC] remove FLEX_COUNTER_DELAY_STATUS_FIELD (#982) (#29) (23 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld pushed a commit to mssonicbld/sonic-buildimage-msft that referenced this pull request Jul 31, 2025
Why I did it
Cherry-pick PR #22849 to update the Nokia PMON submodule
Update Nokia sonic-platform submodule which includes the commits in branch 202405 and 202503.
Include commits:
05abbf6 [IXR7220-D4] Add port leds functionality
d4f4e4d Update Fan Drawer index in cpld and fix fan target speed
4800083 [mackinac] warnings in general build
c5b3a14 [mackinac] adding prom programming spidev; incidental c++ changes without functional impact
fb37c5a [mackinac] working drivers, pcon, sets devices
0c56adf [x3b]Change access permissions for syseeprom
30cbed3 Using PcieUtil utility to check PCIE status
2b41e41 [x1b] modprobe.d/cpuctl.conf
f234d5a [x3b] wait for pcon driver sysfs ready
054d682 [x3b]Fix PSU status check issue (Azure#31)
f6cb50e [X1b] Add support for Nokia X1b platform (Azure#30)
921f9dd Adds CI to build the debian (Azure#29)
7728ef2 [x4][x1b] consolidating shared cpuctl.ko source code from working x3b version
9f73cf4 Fix the reboot-cause fro upgrading from MFG image
7e057f9 [x3b]Update PSU code to adapt the I2C driver modification
c64aba4 Fixed Watchdog and Others reboot-cause
39215bf moving platform_init script output into journal/syslog
4755411 [x3b] combined write/read
3a13b63 Adding bridge code for x3b x1b x4
53a0696 [x3b]Update fan module and thermal algorithm
8052488 [x3b] adds spi bus
0aac79f [x3b]Fix and update fan and thermal modules
169e0d8 Fix reboot-cause for Kernel Panic when kudmp is enabled
dd003e1 [IXR7220-D4] FW Upgrades Support
e143b5f Revert "Reduce traffic loss when the IMM reboots ungracefully"
f7eec2c Revert "Add dependency for IMM ungracefyl reboot service"
b345006 [Chassis] Conditionalize stuffing QFPGA into reset based on kernel AER setting
4652166 [Chassis] Delete FP ports shutdown at LC ungraceful reset time

Work item tracking
Microsoft ADO (number only):
How I did it
Update Nokia sonic-platform submodule which includes the commits in branch 202405 and 202503.
Include commits:
05abbf6 [IXR7220-D4] Add port leds functionality
d4f4e4d Update Fan Drawer index in cpld and fix fan target speed
4800083 [mackinac] warnings in general build
c5b3a14 [mackinac] adding prom programming spidev; incidental c++ changes without functional impact
fb37c5a [mackinac] working drivers, pcon, sets devices
0c56adf [x3b]Change access permissions for syseeprom
30cbed3 Using PcieUtil utility to check PCIE status
2b41e41 [x1b] modprobe.d/cpuctl.conf
f234d5a [x3b] wait for pcon driver sysfs ready
054d682 [x3b]Fix PSU status check issue (Azure#31)
f6cb50e [X1b] Add support for Nokia X1b platform (Azure#30)
921f9dd Adds CI to build the debian (Azure#29)
7728ef2 [x4][x1b] consolidating shared cpuctl.ko source code from working x3b version
9f73cf4 Fix the reboot-cause fro upgrading from MFG image
7e057f9 [x3b]Update PSU code to adapt the I2C driver modification
c64aba4 Fixed Watchdog and Others reboot-cause
39215bf moving platform_init script output into journal/syslog
4755411 [x3b] combined write/read
3a13b63 Adding bridge code for x3b x1b x4
53a0696 [x3b]Update fan module and thermal algorithm
8052488 [x3b] adds spi bus
0aac79f [x3b]Fix and update fan and thermal modules
169e0d8 Fix reboot-cause for Kernel Panic when kudmp is enabled
dd003e1 [IXR7220-D4] FW Upgrades Support
e143b5f Revert "Reduce traffic loss when the IMM reboots ungracefully"
f7eec2c Revert "Add dependency for IMM ungracefyl reboot service"
b345006 [Chassis] Conditionalize stuffing QFPGA into reset based on kernel AER setting
4652166 [Chassis] Delete FP ports shutdown at LC ungraceful reset time

Signed-off-by: mlok <[email protected]>
r12f pushed a commit that referenced this pull request Aug 22, 2025
…tomatically (#1534)

#### Why I did it
src/sonic-gnmi
```
* 3fe851c - (HEAD -> 202412, origin/202412) Add SHOW implementation for interface transceiver presence (#21) (2 hours ago) [zitingguo-ms]
* 68f5323 - Make the output format of show interface errors and show interface fec status compliant (#30) (5 hours ago) [mssonicbld]
* e7de80f - Add dom and port options for SHOW client (#29) (5 hours ago) [mssonicbld]
```
#### 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.

7 participants