Update swss and sairedis modules together to break dependency on each other by prabhataravind · Pull Request #22019 · sonic-net/sonic-buildimage

prabhataravind · 2025-03-12T19:08:19Z

src/sonic-swss

* a07838d5 - [orchagent] Do not restore port admin if port admin is configured (#3447) (5 weeks ago) [PJHsieh]
* ae4789cb - Use software_bfd instead of switch_type. (#3525) (5 weeks ago) [dypet]
* 83988656 - Update gitignore for fabricmgrd, stpmgrd, and the p4orch_tests binaries. (#3552) (5 weeks ago) [Lawrence Lee]
* da189665 - [MCLAG] Fix a race condition when moving MAC addresses to MCLAG peer on one-arm MCLAG interface down. (#3524) (5 weeks ago) [Julian Chang]
* 8447919d - Update test_macsec.py (#3549) (5 weeks ago) [Ze Gan]
* 7a965caf - Optimize counter initialization by reducing the number of bulk counter poll calls and communication between swss/sairedis (#3504) (6 weeks ago) [Stephen Sun]
* 1b2a8e63 - [copp]: Use non-zero trap priority for default trap group (#3502) (6 weeks ago) [prabhataravind]
* a0fcac93 - Initialize Port oper error map only once (#3538) (6 weeks ago) [Prince George]
* 8c778bfb - [smartswitch] Add support for ENI Based Forwarding (#3398) (7 weeks ago) [Vivek]
* 887e3a5d - Add appliance entry validation (#3494) (7 weeks ago) [Mukesh Moopath Velayudhan]
* 3a80d647 - Set Port UPDATE_DSCP attribute when TC_TO_DSCP map is attached (#3517) (7 weeks ago) [Kumaresh Perumal]
* 82632ead - Added Change to Skip Route Programming if NH is link/oper down (#3520) (7 weeks ago) [abdosi]
* 0abfe00d - [SWSS:portsorch] fix child_ports checking in addLagMember and removeLagMember for strip tag (#3343) (7 weeks ago) [Baorong Liu]
* ee85f264 - Update codeowners (#3528) (8 weeks ago) [Prince Sunny]
* 2f004527 - [hash] add SAI_NATIVE_HASH_FIELD_IPV6_FLOW_LABEL to hash-field map for ECMP/LAG switch hash  configuration (#3481) (8 weeks ago) [Andriy Yurkiv]
* 4bc8c90a - sonic-swss: Code changes for WRED and ECN statistics (#2750) (8 weeks ago) [Rajesh Perumal R]
* d3d95abe - portsorch: don't call updateDbPortOperStatus on all port types (#3505) (8 weeks ago) [Brad House]
* 1524054f - [BufferOrch] Use SAI bulk API to configure port, PG and queue (#3452) (8 weeks ago) [Stepan Blyshchak]
* 6c1cd534 - SRv6: add dscp_mode configuration for MySID entry (#3443) (8 weeks ago) [Yakiv Huryk]
* a8a28a84 - [FC] process FC after apply view (#3326) (9 weeks ago) [Stepan Blyshchak]
* 7b740283 - [tests]: fix SRv6 testcases (#3514) (9 weeks ago) [goomadao]
* 29b7db30 - sonic-swss: bfdorch changes to support software bfd sessions (#3406) (9 weeks ago) [Abdel Baig]
* 900f38c8 - [orchagent] implement ring buffer feature with a flag (#3242) (9 weeks ago) [Yijiao Qin]
* 7410b89f - [neighsync] bug: VXLAN EVPN neighbors not in NEIGH_TABLE (#3478) (9 weeks ago) [Brad House]
* 515af60d - [fpmsyncd] Fpmsyncd Next Hop Table Enhancement (#2919) (10 weeks ago) [ntt-omw]
* 60433c7c - Optimize counter polling interval by making it more accurate (#3391) (2 months ago) [Stephen Sun]
* 48908b21 - [portsync] print flags for port netlink message (#3427) (2 months ago) [Junchao-Mellanox]
* 2bff2afd - SRv6: update for uSID endpoint behavior mapping (#3414) (2 months ago) [Yakiv Huryk]
* 9a04ed37 - [vlanmgrd]: Fixing an issue causing mismatch between MAC and link-local IPv6 addresses of VLAN and Bridge interfaces (#3476) (2 months ago) [mramezani95]
* d7d07bd5 - Git ignore .gcda and .gcno in all folders (#3479) (2 months ago) [Stephen Sun]
* 656640cc - Avoid segment fault in ASIC/SDK health event handling when vendor SAI passes an invalid timestamp (#3446) (3 months ago) [Stephen Sun]
* 257d32d2 - Add heartbeat interval parameter. (#3458) (3 months ago) [Hua Liu]
* 455027e8 - use --add-tracefile option to handle duplicate SF in coverage.info (#3482) (3 months ago) [Yijiao Qin]
* 685075ea - Remove RIF from m_rifsToAdd before deleting it (#3336) (3 months ago) [Tomer Shalvi]
* 4b8cad49 - [SRv6] Add support for SRv6 VPN (#3293) (3 months ago) [Shuai Shang]
* df08d2d8 - Avoid removing a VRF routing table when there are pending creation entries in gRouteBulker (#3477) (3 months ago) [Stephen Sun]
* e181e3c5 - [orchagent]: VXLAN: Fix oper_status and tunnel encapsulation TTL (#3383) (3 months ago) [Brad House]
* ca13857c - Link orchagent against jemalloc (#3473) (3 months ago) [Lawrence Lee]
* 64c180cb - [tests]: Fix SRv6 test cases (#3486) (3 months ago) [Carmine Scarpitta]
* ae5a50b0 - [ACL] Add Tunnel Next Hop redirect support (#3399) (3 months ago) [Vivek]
* ec2957c7 - [swss] Fix for STATE_DB update for removed port during breakout (#3474) (3 months ago) [ChiouRung Haung]

src/sonic-sairedis

* 7a7320ae - [syncd] Move log set function after api initialize (#1548) (4 weeks ago) [Kamil Cudnik]
* 42e1c2e4 - [FC] Fix the update failure in switch debug counters (#1556) (4 weeks ago) [Vivek]
* ab680b0b - Support auto negotiation (#1549) (4 weeks ago) [Stephen Sun]
* 8c44c07d - update start.sh for new sonic-swss soft bfd tests. (#1558) (4 weeks ago) [dypet]
* dc42f34a - Update build_and_install_module.sh to match newer Linux kernel version (#1551) (5 weeks ago) [xwjiang-ms]
* 6ee6444a - Update to support SAI BFD_SESSION_OFFLOAD_TYPE. (#1546) (6 weeks ago) [dypet]
* 68a3c0ca - [vslib] SAI_KEY_VS_OPER_SPEED_IS_CONFIGURED_SPEED, SAI_PORT_ATTR_HOST_TX_READY_STATUS support (#1458) (7 weeks ago) [Wataru Ishida]
* e212a877 - [sairedis/syncd] Implement bulk get support (#1509) (7 weeks ago) [Stepan Blyshchak]
* bc85ac80 - Fix counter issues on VS platform (#1540) (7 weeks ago) [Stephen Sun]
* 25643541 - [hash] update ECMP/LAG hash VS lib with  SAI_NATIVE_HASH_FIELD_IPV6_FLOW_LABEL (#1508) (8 weeks ago) [Andriy Yurkiv]
* 988a8ec2 - Update stub.pl to skip api custom range base (#1537) (8 weeks ago) [Kamil Cudnik]
* 3bb94cef - [dash] Use CMD syncd_dash for kvm dpu (#1500) (8 weeks ago) [Junhua Zhai]
* 24aed42a - Optimize counter initialization by reducing the number of bulk counter poll calls and communication between swss/sairedis (#1527) (8 weeks ago) [Stephen Sun]
* f464a1e2 - [syncd] Update log level for bulk api (#1492) (9 weeks ago) [Jianyue Wu]
* 7479aa20 - Fixing the sairedis build issue caused at https://github.com/sonic-net/sonic-buildimage/pull/21614 , Reverting the testcase (#1526) (9 weeks ago) [Rajesh Perumal R]
* afaa59d5 - [syncd] Support SAI_SWITCH_ATTR_VXLAN_DEFAULT_ROUTER_MAC (#1529) (9 weeks ago) [Kamil Cudnik]
* a7efc642 - Revert "Do not enter vendor SAI critical section for counter polling/clearing operations (#1450)" (#1498) (10 weeks ago) [Stephen Sun]
* 8fe55967 - Optimize counter polling interval by making it more accurate (#1457) (10 weeks ago) [Stephen Sun]
* 0657fb3d - [azp] Download and install sonic-platform-vpp artifacts (#1521) (2 months ago) [Kamil Cudnik]
* b664f081 - [syncd] Move logSet logGet under mutex to prevent race condition (#1505) (2 months ago) [Kamil Cudnik]
* e11a959a - [FC] Support Policer Counter (#1484) (2 months ago) [Shira]
* 0f3b34eb - [nvidia] Skip SAI discovery on ports (#1416) (2 months ago) [Stepan Blyshchak]
* e72e49aa - Define bulk chunk size and bulk chunk size per counter ID. (#1519) (2 months ago) [Stephen Sun]
* be0c83da - sonic-sairedis : Wred stats feature changes on Sai-redis and Syncd (#1234) (2 months ago) [Rajesh Perumal R]
* 3c1ede96 - Use sonictest pool instead of sonic-common and fix arm64 issue. (#1511) (2 months ago) [Liu Shilong]

Why I did it

PR sonic-net/sonic-swss#3391 has a dependency on sonic-net/sonic-sairedis#1519 and therefore the two submodules need to be updated together.

Work item tracking

Microsoft ADO (number only):

How I did it

By updating both swss and sairedis submodules together.

How to verify it

Ran sanity checks on kvm testbeds

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

Tested branch (Please provide the tested image version)

Description for the changelog

Update swss and sairedis modules together to break dependency on each other.

Link to config_db schema for YANG module changes

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

mssonicbld · 2025-03-12T19:08:48Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-12T19:09:00Z

Azure Pipelines successfully started running 1 pipeline(s).

* Due to dependencies, both need to be updated together Signed-off-by: Prabhat Aravind <[email protected]>

mssonicbld · 2025-03-13T02:25:14Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-13T02:25:24Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-03-13T21:46:55Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-13T21:47:09Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-03-14T18:14:02Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-14T18:14:15Z

Azure Pipelines successfully started running 1 pipeline(s).

stephenxs · 2025-03-17T02:12:51Z

@prabhataravind @prsunny @kcudnik
Looks like all failures were due to error messages:
E 2025 Mar 14 21:56:15.927607 vlab-01 ERR swss#orchagent: :- isAutoNegEnabled: Failed to get port AutoNeg status for port pid:1000000000008
which should be fixed by sonic-net/sonic-sairedis#1549

logSet: virtual sai_status_t saivs::Sai::logSet(sai_api_t, sai_log_level_t): api not initialized
which should be fixed by sonic-net/sonic-sairedis#1548

other issues do not seem like relevant to swss/sairedis change
E 2025 Mar 15 00:24:56.992152 vlab-03 ERR hostcfgd: ['sonic-kdump-config', '--ssh_string', 'user@localhost'] - failed: return code - 2, output:#012None E E 2025 Mar 15 00:24:59.024522 vlab-03 ERR hostcfgd: ['sonic-kdump-config', '--ssh_path', '/a/b/c'] - failed: return code - 2, output:#012None E

E 2025 Mar 15 00:25:27.681066 vlab-03 ERR sonic-db-cli: :- guard: RedisReply catches system_error: command: *9\r\n$4\r\nHSET\r\n$25\r\nDEVICE_METADATA|localhost\r\n$21\r\nchassis_serial_number\r\n$8\r\nPlatform\r\n$20\r\nx86_64-kvm_x86_64-r0\r\n$4\r\ndoes\r\n$3\r\nnot\r\n$7\r\nsupport\r\n$6\r\nEEPROM\r\n, reason: ERR wrong number of arguments for 'hset' command: Input/output error E E 2025 Mar 15 00:25:27.681166 vlab-03 INFO snmp.sh[36764]: RedisReply catches system_error: command: *9\r\n$4\r\nHSET\r\n$25\r\nDEVICE_METADATA|localhost\r\n$21\r\nchassis_serial_number\r\n$8\r\nPlatform\r\n$20\r\nx86_64-kvm_x86_64-r0\r\n$4\r\ndoes\r\n$3\r\nnot\r\n$7\r\nsupport\r\n$6\r\nEEPROM\r\n, reason: ERR wrong number of arguments for 'hset' command: Input/output error: Input/output error E E 2025 Mar 15 00:25:33.819097 vlab-03 ERR pmon#chassis_db_init: Failed to load chassis due to ModuleNotFoundError("No module named 'sonic_platform'") E

prsunny · 2025-03-17T17:25:45Z

Thanks @stephenxs for the input. @prabhataravind , can we rebase to latest sairedis commit?

prabhataravind · 2025-03-17T17:34:10Z

Thanks @stephenxs for the input. @prabhataravind , can we rebase to latest sairedis commit?

@prsunny @stephenxs, PRs sonic-net/sonic-sairedis#1548 and sonic-net/sonic-sairedis#1549 are not yet merged. Once merged, I can try rebasing to the latest sairedis master.

Signed-off-by: Prabhat Aravind <[email protected]>

mssonicbld · 2025-03-18T23:52:22Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-18T23:52:36Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Prabhat Aravind <[email protected]>

mssonicbld · 2025-03-20T15:41:22Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-20T15:41:36Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-03-20T22:45:31Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-20T22:45:42Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-03-24T21:03:27Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-24T21:03:40Z

Azure Pipelines successfully started running 1 pipeline(s).

azure-pipelines · 2025-04-02T15:52:11Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-04-04T17:54:54Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-04-04T17:55:05Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-04-06T16:06:40Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-04-06T16:06:52Z

Azure Pipelines successfully started running 1 pipeline(s).

prabhataravind · 2025-04-12T04:44:58Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2025-04-12T04:45:00Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2025-04-12T04:45:12Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-04-15T21:40:56Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-04-15T21:41:07Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-04-16T15:03:33Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-04-16T15:03:45Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-04-18T16:36:31Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-04-18T16:36:42Z

Azure Pipelines successfully started running 1 pipeline(s).

prsunny

@yxieca , please merge

prsunny · 2025-04-18T23:39:14Z

@prabhataravind , please update commit messages in description. Reference - #22340

Update swss and sairedis modules to latest master

7cec28f

* Due to dependencies, both need to be updated together Signed-off-by: Prabhat Aravind <[email protected]>

prabhataravind force-pushed the paravind/fix_swss_build branch from bbee85f to 7cec28f Compare March 13, 2025 02:24

prabhataravind changed the title ~~Update swss submodule to 5ee2059e6ca34918de86c4d36daa666658fcad34~~ Update swss and sairedis modules to latest master Mar 13, 2025

prabhataravind mentioned this pull request Mar 13, 2025

[submodule][master] Update submodule sonic-swss to the latest HEAD automatically #21572

Closed

Merge branch 'sonic-net:master' into paravind/fix_swss_build

1043eba

Merge branch 'sonic-net:master' into paravind/fix_swss_build

19757c2

Update sairedis to commit ab680b0b7567bd1560f112068c4e48c92dba9b28

2450fb0

Signed-off-by: Prabhat Aravind <[email protected]>

prabhataravind mentioned this pull request Mar 19, 2025

[syncd] Move log set function after api initialize sonic-net/sonic-sairedis#1548

Merged

Update sairedis to commit 7a7320ae687d1b90b000e372805cd8a8047302f7

a84f0a4

Signed-off-by: Prabhat Aravind <[email protected]>

Merge branch 'sonic-net:master' into paravind/fix_swss_build

d3e5756

Merge branch 'sonic-net:master' into paravind/fix_swss_build

0ebc1cc

Merge branch 'sonic-net:master' into paravind/fix_swss_build

a658638

Merge branch 'sonic-net:master' into paravind/fix_swss_build

b43916c

Merge branch 'sonic-net:master' into paravind/fix_swss_build

a360f36

Merge branch 'sonic-net:master' into paravind/fix_swss_build

e05c979

Merge branch 'sonic-net:master' into paravind/fix_swss_build

1517b6b

prabhataravind changed the title ~~Update swss and sairedis modules to latest master~~ Update swss and sairedis modules together to break dependency on each other Apr 16, 2025

Merge branch 'sonic-net:master' into paravind/fix_swss_build

a67a3ad

prabhataravind marked this pull request as ready for review April 18, 2025 23:29

prabhataravind requested a review from lguohan as a code owner April 18, 2025 23:29

prsunny approved these changes Apr 18, 2025

View reviewed changes

qiluo-msft merged commit 66a1d2d into sonic-net:master Apr 18, 2025
19 checks passed

prsunny added the Submodule Update ⏫ label Apr 18, 2025

prabhataravind deleted the paravind/fix_swss_build branch May 1, 2025 20:37

Conversation

prabhataravind commented Mar 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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)

Uh oh!

mssonicbld commented Mar 12, 2025

Uh oh!

azure-pipelines bot commented Mar 12, 2025

Uh oh!

mssonicbld commented Mar 13, 2025

Uh oh!

azure-pipelines bot commented Mar 13, 2025

Uh oh!

mssonicbld commented Mar 13, 2025

Uh oh!

azure-pipelines bot commented Mar 13, 2025

Uh oh!

mssonicbld commented Mar 14, 2025

Uh oh!

azure-pipelines bot commented Mar 14, 2025

Uh oh!

stephenxs commented Mar 17, 2025

Uh oh!

prsunny commented Mar 17, 2025

Uh oh!

prabhataravind commented Mar 17, 2025

Uh oh!

mssonicbld commented Mar 18, 2025

Uh oh!

azure-pipelines bot commented Mar 18, 2025

Uh oh!

mssonicbld commented Mar 20, 2025

Uh oh!

azure-pipelines bot commented Mar 20, 2025

Uh oh!

mssonicbld commented Mar 20, 2025

Uh oh!

azure-pipelines bot commented Mar 20, 2025

Uh oh!

mssonicbld commented Mar 24, 2025

Uh oh!

azure-pipelines bot commented Mar 24, 2025

Uh oh!

azure-pipelines bot commented Apr 2, 2025

Uh oh!

mssonicbld commented Apr 4, 2025

Uh oh!

azure-pipelines bot commented Apr 4, 2025

Uh oh!

mssonicbld commented Apr 6, 2025

Uh oh!

azure-pipelines bot commented Apr 6, 2025

Uh oh!

prabhataravind commented Apr 12, 2025

Uh oh!

mssonicbld commented Apr 12, 2025

Uh oh!

azure-pipelines bot commented Apr 12, 2025

Uh oh!

mssonicbld commented Apr 15, 2025

Uh oh!

azure-pipelines bot commented Apr 15, 2025

Uh oh!

mssonicbld commented Apr 16, 2025

Uh oh!

azure-pipelines bot commented Apr 16, 2025

Uh oh!

mssonicbld commented Apr 18, 2025

Uh oh!

azure-pipelines bot commented Apr 18, 2025

Uh oh!

prsunny left a comment

prabhataravind commented Mar 12, 2025 •

edited

Loading