[countersyncd]: fix 202412 backport cleanup regressions#215
Merged
Pterosaur merged 1 commit intoAzure:202412from Mar 13, 2026
Merged
Conversation
Signed-off-by: Ze Gan <ganze718@gmail.com>
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
Fix follow-up cleanup regressions in the recent
countersyncd202412 backports.Specifically:
object_names_mapupdates left behind after theobject_id_name_mapconversion inipfix.rsipfix.rstests to use the currentIPFixTemplatesMessage::new(..., object_names, object_ids)signatureobject_id_name_mapSwssActorwrapper helpers as#[cfg(test)]so non-test builds do not fail underRUSTFLAGS=-DwarningsWhy I did it
The recent 202412 backport stack for sonic-net/sonic-swss PRs 4316/4317/4318/4319 had two cleanup gaps:
#4318backport (41c6d27b) renamed the actor field toobject_id_name_mapbut left staleobject_names_mapreferences inipfix.rsand related tests.#4319backport (4150bafc) introduced static helper paths inswss.rswhile leaving older instance wrapper methods only used by tests, which tripsdead_codewhen building withRUSTFLAGS=-Dwarnings.This PR makes the 202412 branch compile and test cleanly again.
How I verified it
In a CI-like
sonic-slave-bookwormcontainer:RUSTFLAGS=-Dwarnings cargo test --locked --manifest-path crates/countersyncd/Cargo.tomlResult:
0Details if related
This is a fix-up for the recent 202412 backports corresponding to: