[test] Build with ComponentStats-based SwssStats (PR sonic-swss#4516 + sonic-swss-common#1180)#27554
Open
yutongzhang-microsoft wants to merge 2 commits into
Conversation
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR stages a SONiC buildimage CI run for the ComponentStats-based SwssStats refactor by repointing the sonic-swss and sonic-swss-common submodules to non-upstream forks/branches that contain the in-flight changes.
Changes:
- Switch
src/sonic-swss-commonsubmodule URL toyutongzhang-microsoft/sonic-swss-commonand setbranch = feature/component-stats. - Switch
src/sonic-swsssubmodule URL toyutongzhang-microsoft/sonic-swssand setbranch = swss-stats-use-componentstats.
Comment on lines
1
to
+4
| [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 |
Comment on lines
11
to
+14
| [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 |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Comment on lines
2
to
+4
| 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 |
Comment on lines
+13
to
+14
| url = https://github.com/yutongzhang-microsoft/sonic-swss | ||
| branch = swss-stats-use-componentstats |
yutongzhang-microsoft
force-pushed
the
swss-stats-implementation-v3
branch
from
626592a to
b9c1669
Compare
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
/azpw ms_conflict |
…+ sonic-swss-common#1180) Rebased onto fresh upstream master to drop conflicts. Submodule pins: * src/sonic-swss-common -> faccc77 (feature/component-stats, includes r12f/banidoru review fixes) * src/sonic-swss -> dd8ef32 (swss-stats-use-componentstats, includes r12f shared_ptr const fix and master merge) .gitmodules URLs are temporarily switched to fork mirrors so CI can resolve the non-upstream SHAs. Signed-off-by: Yutong Zhang <yutongzhang@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
yutongzhang-microsoft
force-pushed
the
swss-stats-implementation-v3
branch
from
60351ae to
dab2567
Compare
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Rebase feature/component-stats onto upstream/master to pick up ZmqProducerBatchedSet/ZmqProducerBatchedDel SWIG bindings (PR sonic-net#1188) required by sonic-gnmi master, fixing the build failure: sonic_data_client/mixed_db_client.go:315:13: undefined: swsscommon.ZmqProducerBatchedSet sonic_data_client/mixed_db_client.go:321:13: undefined: swsscommon.ZmqProducerBatchedDel Signed-off-by: Yutong Zhang <yutongzhang@microsoft.com>
yutongzhang-microsoft
force-pushed
the
swss-stats-implementation-v3
branch
from
dab2567 to
899588f
Compare
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
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
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.
What I did
Recreated #27456 on top of fresh upstream master to drop the conflicts that accumulated on the old branch.
Repoints two submodules to forks carrying the ComponentStats-based SwssStats refactor:
src/sonic-swss-commonb21b74e(feature/component-stats)src/sonic-swss3710025(swss-stats-use-componentstats).gitmodulesURLs are temporarily switched tohttps://github.com/yutongzhang-microsoft/...so CI can resolve the non-upstream SHAs.The swss-common SHA already includes banidoru's review fixes (lock-free hot path via shared_mutex + merged
lookupOrCreate, final flush on shutdown, registry pruning,setValueexclusive lock + documented gauge/counter mixing caveat).Why I did it
The two source PRs need a sonic-buildimage CI run to validate that the refactored library + facade build cleanly inside the swss container and produce the expected
SWSS_STATS:*keys at runtime. The previous staging PR (#27456) had too many conflicts to be a useful CI signal.This PR is not for merge — once both source PRs land upstream, it will be rewritten to point
.gitmodulesURLs back atsonic-net/...and the submodule SHAs back to upstream master.How to verify
NOSTRETCH=1 NOBULLSEYE=1 make target/docker-orchagent.gz make target/sonic-vs.img.gzBoot sonic-vs, then:
redis-cli -n 2 KEYS "SWSS_STATS:*" redis-cli -n 2 HGETALL "SWSS_STATS:PORT_TABLE"Should show
SET / DEL / COMPLETE / ERRORcounters incrementing as orchagent processes tasks.Follow-up
Once both source PRs are merged upstream:
.gitmodulesURLs tosonic-net/...Supersedes #27456.