From 8d6f95161c30aaddd4df3d607be1173837927352 Mon Sep 17 00:00:00 2001 From: Yutong Zhang Date: Wed, 20 May 2026 10:16:05 +0800 Subject: [PATCH 1/2] [test] Build with ComponentStats-based SwssStats (PR sonic-swss#4516 + sonic-swss-common#1180) Recreated on top of current master to resolve conflicts in #26924. Repoints submodules to forks carrying the ComponentStats refactor: - src/sonic-swss-common -> yutongzhang-microsoft @ feature/component-stats (55673525d58) - src/sonic-swss -> yutongzhang-microsoft @ swss-stats-use-componentstats (37100258229) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Yutong Zhang --- .gitmodules | 6 ++++-- src/sonic-swss | 2 +- src/sonic-swss-common | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 715e14ebfdf..eb58189697b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "sonic-swss-common"] path = src/sonic-swss-common - url = https://github.com/sonic-net/sonic-swss-common + url = https://github.com/yutongzhang-microsoft/sonic-swss-common + branch = feature/component-stats [submodule "sonic-linux-kernel"] path = src/sonic-linux-kernel url = https://github.com/sonic-net/sonic-linux-kernel @@ -9,7 +10,8 @@ url = https://github.com/sonic-net/sonic-sairedis [submodule "sonic-swss"] path = src/sonic-swss - url = https://github.com/sonic-net/sonic-swss + url = https://github.com/yutongzhang-microsoft/sonic-swss + branch = swss-stats-use-componentstats [submodule "src/p4c-bm/p4c-bm"] path = platform/p4/p4c-bm/p4c-bm url = https://github.com/krambn/p4c-bm diff --git a/src/sonic-swss b/src/sonic-swss index 6fcf467fdc4..37100258229 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 6fcf467fdc4f631ae4c9b2786653dc8e6d7d0d54 +Subproject commit 37100258229f6d2929d6d02c1a18192dc7567be4 diff --git a/src/sonic-swss-common b/src/sonic-swss-common index 158de8d3463..55673525d58 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit 158de8d3463ff4b841653f6d57190bb142b80d9c +Subproject commit 55673525d58ac91958581a6fc341a96f7116cd15 From cfe2f0a5bd590c17f6bc07f9118d337b5ed352a7 Mon Sep 17 00:00:00 2001 From: Yutong Zhang Date: Wed, 27 May 2026 16:27:08 +0000 Subject: [PATCH 2/2] [test] Bump sonic-swss-common submodule to b21b74e (PR #1180 review fixes) Picks up review fixes from sonic-net/sonic-swss-common#1180 that address banidoru's feedback: * Lock-free hot path via shared_mutex + merged lookupOrCreate * Final flush on shutdown so no in-flight updates are dropped * Registry pruning of expired weak_ptr slots * setValue exclusive lock + documented gauge/counter mixing caveat Public API (increment/setValue/get/getAll/setEnabled/stop) is unchanged, so sonic-swss SwssStats facade does not need to move. Signed-off-by: Yutong Zhang Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- src/sonic-swss-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss-common b/src/sonic-swss-common index 55673525d58..b21b74ed34b 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit 55673525d58ac91958581a6fc341a96f7116cd15 +Subproject commit b21b74ed34b6ec83ce59279086778ab3eeb4549a