[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#26
Merged
gechiang merged 21 commits intoAzure:202205from Jun 9, 2023
Merged
[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#26gechiang merged 21 commits intoAzure:202205from
gechiang merged 21 commits intoAzure:202205from
Conversation
Collaborator
mssonicbld
commented
Jun 9, 2023
mssonicbld
commented
* [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]
…ded (#14933) (#15316)
…D automatically (#15318) src/sonic-platform-daemons * 616f13f - (HEAD -> 202205, origin/202205) [ycabled] fix bug for `show mux status` delayed response (Azure#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]
…D automatically (#15344) src/sonic-platform-daemons * 1537d6a - (HEAD -> 202205, origin/202205) [dualtor] Fix command `show mux status` (Azure#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' (Azure#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 (Azure#355)" (3 minutes ago) [Ying Xie] * 5324554 - Revert "add async notification support in active-active topo; refactor code for ycable tasks for change events (Azure#327)" (3 minutes ago) [Ying Xie] * cbbe2b5 - Revert "[ycabled] fix bug for `show mux status` delayed response (Azure#364)" (3 minutes ago) [Ying Xie] * 9746709 - Revert "[dualtor] Fix command `show mux status` (Azure#371)" (3 minutes ago) [Ying Xie] * 551ab3c - Revert "[ycabled] correct the wrong function call for 'config hwmode state' (Azure#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 Azure#109 from zbud-msft/backport-202205 (86 minutes ago) [Ying Xie] * 0f75a64 - [202012] Workaround gomonkey for armhf (Azure#88) (3 weeks ago) [Zain Budhwani] * 1b0dc75 - Fix Makefile error (3 weeks ago) [Zain Budhwani] * 72e4540 - Add diff cov (Azure#85) (3 weeks ago) [Zain Budhwani] * 11aace5 - Add get-update to azp yml (Azure#79) (3 weeks ago) [Zain Budhwani] * 3eaaccc - Add net core and code coverage results (Azure#77) (3 weeks ago) [Zain Budhwani] * 3cf3883 - Enable unit test (3 weeks ago) [ganglyu] * 2a0928f - Change dir name in pipeline (Azure#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 (Azure#281) (2 minutes ago) [Prince George]
jon-nokia
pushed a commit
to jon-nokia/sonic-buildimage-msft
that referenced
this pull request
Aug 9, 2023
Added below commits: 9b30690 jcaiMR Fri Dec 16 fix handleSwssNotification crash in dhcp6relay (Azure#28) 047afb7 jcaiMR Wed Dec 14 14:08:58 2022 +0800 Fix multiple vlan issue (Azure#27) ff6bec3 Vivek Thu Dec 8 09:44:15 2022 -0800 Made the Error log informative (Azure#22) 2fbe729 jcaiMR Wed Nov 30 14:41:53 2022 +0800 disable cfg dynamic change (Azure#25) 13d0805 Liu Shilong Wed Nov 30 10:54:11 2022 +0800 Use github code scanning instead of LGTM (Azure#26) 1e846f6 kellyyeh Wed Nov 23 14:36:02 2022 -0800 Fix packet range check for relay-reply packets (Azure#21) 4d19e13 kellyyeh Thu Nov 17 10:04:53 2022 -0800 Add unittest infrastructure (Azure#5) 7f4fdab jcaiMR Fri Nov 11 14:47:51 2022 +0800 fix packet range check issue (Azure#20) 257ecdf kellyyeh Thu Nov 3 11:34:11 2022 -0700 Add client packet UDP header length check (Azure#19)
gechiang
added a commit
that referenced
this pull request
Sep 27, 2023
[submodule][202205] Update submodule sonic-utilities to the latest HEAD automatically * 8cf9817 - (HEAD -> 202205, origin/202205) Merge pull request #26 from jfeng-arista/202205-clear-fabric-counters (8 hours ago) [gechiang] * 4c91f77 - Clear fabric counters queue/port (4 weeks ago) [Jie Feng]
r12f
pushed a commit
that referenced
this pull request
Dec 19, 2024
…tically (#20199) #### Why I did it src/sonic-dash-api ``` * 0b33087 - (HEAD -> master, origin/master, origin/HEAD) Add local region ID field to Dash appliance table (#26) (31 hours ago) [Mukesh Moopath Velayudhan] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Feb 18, 2025
… automatically (#635) #### Why I did it src/sonic-platform-common ``` * d9de488 - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#28) (7 hours ago) [mssonicbld] * 30112ca - [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#26) (31 hours ago) [mssonicbld] * a36263b - [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#24) (2 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Mar 4, 2025
…tomatically (#769) #### Why I did it src/sonic-linux-kernel ``` * c1e35be - (HEAD -> 202412, origin/HEAD, origin/202412) [code sync] Merge code from sonic-net/sonic-linux-kernel:202411 to 202412 (#26) (21 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
Merged
10 tasks
arlakshm
added a commit
that referenced
this pull request
May 16, 2025
…or Nokia-IXR7250-X3B (#1125) <!-- 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 Update sonic-platform submodule for Nokia-IXR7250-X3B platform 7fed75b [x3b]Update Fan, Thermal, PSU (#26) ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Update sonic-platform submodule for Nokia-IXR7250-X3B platform 7fed75b [x3b]Update Fan, Thermal, PSU (#26) This PR works with sonic-net/sonic-buildimage#22626 #### 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)
mssonicbld
added a commit
that referenced
this pull request
Jul 4, 2025
…test HEAD automatically (#1318) #### Why I did it src/sonic-platform-daemons ``` * 8a7e51a - (HEAD -> 202405, origin/202405) Merge pull request #26 from az-pz/ariz/catch-xcvrd-exception-when-eeprom-read-is-unsuccessful-202405 (2 hours ago) [Jianquan Ye] * edd2af8 - Catch the xcvrd exception returned by get_transceiver_info (34 hours ago) [Ariz Zubair] ``` #### 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
6 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.