Skip to content

Push latest masters of swss-common, sairedis and swss#1730

Closed
pavel-shirshov wants to merge 2 commits intosonic-net:201803from
pavel-shirshov:pavelsh/next_0330
Closed

Push latest masters of swss-common, sairedis and swss#1730
pavel-shirshov wants to merge 2 commits intosonic-net:201803from
pavel-shirshov:pavelsh/next_0330

Conversation

@pavel-shirshov
Copy link
Contributor

Please don't merge it!

- What I did
Push latest masters of sonic-swss-common, sonic-sairedis and sonic-swss into 201803 release.

- How I did it

- How to verify it

- Description for the changelog

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

wen587 added a commit that referenced this pull request Oct 26, 2021
8ea834b [sonic_installer] Change sonic_installer check ASIC mismatch by platforms list (#1836)
9017d99 Fix the option missing in kernel config issue (#1888)
6595ad4 [mlag] fix log print sequence (#1730)
e600e1c CLI command to load config in Yang format (#1781)
00948d0 Fix the target db version of portchannel-key test (#1842)
6412fea [sonic-package-manager] remove make_python_identifier (#1801)
f738818 [sonic-package-manager] stop service explicitelly before uninstalling package (#1805)
d8ee5e9 Remove exec from platform_reboot_plugin call to handle any hang issue. (#1879)
827fcee [chassis][routecheck]filter out the chassis internal interfaces (#1798)
4d732c6 [generic_config_updater] Logging (#1864)
25bb184 [config]: Add loopback interfaces to interface name checker (#1869)
c950a55 Validate input of config mirror_session add (#1825)
9ab20fd [show][config] fix the muxcable commands for interface naming mode (#1862)
476b3a4 [multi-asic][cli][chassis-db] Avoid connecting to chassis db for cli commands executed from linecard (#1707)
taras-keryk pushed a commit to taras-keryk/sonic-buildimage that referenced this pull request Apr 28, 2022
#### What I did
fix error log variable print sequence, otherwise it is confusable 
#### How I did it
change the varible print sequence

#### New command output (if the output of a command-line utility has changed)
before keepalive-interval setting:
```
root@sonic:/home/admin# config mclag 1 keepalive-interval 30
MCLAG Keepalive:15 Session_timeout:30 values not satisfying session_timeout >= (3 * KA)
```
after fixing:
```
root@sonic:/home/admin# config mclag 1 keepalive-interval 30
MCLAG Keepalive:30 Session_timeout:15 values not satisfying session_timeout >= (3 * KA)
```
patrickmacarthur pushed a commit to patrickmacarthur/sonic-buildimage that referenced this pull request Dec 11, 2025
…t#1730)

<!--
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
When running load_minigraph or reloading configuration on the linecards,
the `interface-config.service` restarts, which causes the midplane
interface to flap. If swss.sh on the linecards deletes state from
chassis_db, some states may not be cleaned up correctly, while others
are successfully removed. For example, cleanup for `SYSTEM_NEIGHBOR` or
`SYSTEM_INTF` may fail, but SYSTEM_LAG cleanup might succeed. This can
lead to inconsistent lag IDs for the remote LC.

##### Work item tracking
- Microsoft ADO **35454463**

#### How I did it
Add logic to retry in swss.sh script.

#### How to verify it
Run test to do load_minigraph on all the linecards and check for the
logs to for remove lag failure for Lags on remote LC.

<!--
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
-->

- [ ] 202205
- [ ] 202211
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505

#### 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 Jan 31, 2026
…tically (#25251)

#### Why I did it
src/sonic-sairedis
```
* 8c3d40d5 - (HEAD -> master, origin/master, origin/HEAD) Add PORT_PHY_ATTR flex counter support (#1674) (9 hours ago) [Dhanasekar Rathinavel]
* 5966a71b - Update SAI Header to latest (#1742) (2 days ago) [Tejaswini Chadaga]
* 2752ad6c - [multi-asic][Mellanox] add support for Mellanox multi-asic (#1683) (3 days ago) [Yakiv Huryk]
* c4e3c142 - Fix deadlock between syncd and orchagent syncd during initialization failure (#1723) (7 days ago) [DavidZagury]
* 50c5626c - Fix dash meter COUNTERS_DB keys to use VID instead of RID (#1725) (8 days ago) [Mukesh Moopath Velayudhan]
* 7632eebb - [Mellanox] Add phcsync activation for mellanox platforms. (#1734) (9 days ago) [‪Zili Bombach‬‏]
* 9eeffe38 - fix docker slave name (#1730) (10 days ago) [yijingyan2]
* 90670166 - Use matching slave container from the branch we're building against (#1743) (10 days ago) [Saikrishna Arcot]
```
#### How I did it
#### How to verify it
#### Description for the changelog
xincunli-sonic pushed a commit to xincunli-sonic/sonic-buildimage that referenced this pull request Feb 2, 2026
…tically (sonic-net#25251)

#### Why I did it
src/sonic-sairedis
```
* 8c3d40d5 - (HEAD -> master, origin/master, origin/HEAD) Add PORT_PHY_ATTR flex counter support (sonic-net#1674) (9 hours ago) [Dhanasekar Rathinavel]
* 5966a71b - Update SAI Header to latest (sonic-net#1742) (2 days ago) [Tejaswini Chadaga]
* 2752ad6c - [multi-asic][Mellanox] add support for Mellanox multi-asic (sonic-net#1683) (3 days ago) [Yakiv Huryk]
* c4e3c142 - Fix deadlock between syncd and orchagent syncd during initialization failure (sonic-net#1723) (7 days ago) [DavidZagury]
* 50c5626c - Fix dash meter COUNTERS_DB keys to use VID instead of RID (sonic-net#1725) (8 days ago) [Mukesh Moopath Velayudhan]
* 7632eebb - [Mellanox] Add phcsync activation for mellanox platforms. (sonic-net#1734) (9 days ago) [‪Zili Bombach‬‏]
* 9eeffe38 - fix docker slave name (sonic-net#1730) (10 days ago) [yijingyan2]
* 90670166 - Use matching slave container from the branch we're building against (sonic-net#1743) (10 days ago) [Saikrishna Arcot]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: Xincun Li <stli@microsoft.com>
FengPan-Frank pushed a commit to FengPan-Frank/sonic-buildimage that referenced this pull request Mar 6, 2026
…tically (sonic-net#25251)

#### Why I did it
src/sonic-sairedis
```
* 8c3d40d5 - (HEAD -> master, origin/master, origin/HEAD) Add PORT_PHY_ATTR flex counter support (sonic-net#1674) (9 hours ago) [Dhanasekar Rathinavel]
* 5966a71b - Update SAI Header to latest (sonic-net#1742) (2 days ago) [Tejaswini Chadaga]
* 2752ad6c - [multi-asic][Mellanox] add support for Mellanox multi-asic (sonic-net#1683) (3 days ago) [Yakiv Huryk]
* c4e3c142 - Fix deadlock between syncd and orchagent syncd during initialization failure (sonic-net#1723) (7 days ago) [DavidZagury]
* 50c5626c - Fix dash meter COUNTERS_DB keys to use VID instead of RID (sonic-net#1725) (8 days ago) [Mukesh Moopath Velayudhan]
* 7632eebb - [Mellanox] Add phcsync activation for mellanox platforms. (sonic-net#1734) (9 days ago) [‪Zili Bombach‬‏]
* 9eeffe38 - fix docker slave name (sonic-net#1730) (10 days ago) [yijingyan2]
* 90670166 - Use matching slave container from the branch we're building against (sonic-net#1743) (10 days ago) [Saikrishna Arcot]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: Feng Pan <fenpan@microsoft.com>
dprital pushed a commit that referenced this pull request Mar 19, 2026
…tically (#25251)

#### Why I did it
src/sonic-sairedis
```
* 8c3d40d5 - (HEAD -> master, origin/master, origin/HEAD) Add PORT_PHY_ATTR flex counter support (#1674) (9 hours ago) [Dhanasekar Rathinavel]
* 5966a71b - Update SAI Header to latest (#1742) (2 days ago) [Tejaswini Chadaga]
* 2752ad6c - [multi-asic][Mellanox] add support for Mellanox multi-asic (#1683) (3 days ago) [Yakiv Huryk]
* c4e3c142 - Fix deadlock between syncd and orchagent syncd during initialization failure (#1723) (7 days ago) [DavidZagury]
* 50c5626c - Fix dash meter COUNTERS_DB keys to use VID instead of RID (#1725) (8 days ago) [Mukesh Moopath Velayudhan]
* 7632eebb - [Mellanox] Add phcsync activation for mellanox platforms. (#1734) (9 days ago) [‪Zili Bombach‬‏]
* 9eeffe38 - fix docker slave name (#1730) (10 days ago) [yijingyan2]
* 90670166 - Use matching slave container from the branch we're building against (#1743) (10 days ago) [Saikrishna Arcot]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: dprital <drorp@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant