Skip to content

[countersyncd]: fix 202412 backport cleanup regressions#215

Merged
Pterosaur merged 1 commit intoAzure:202412from
Pterosaur:fix/202412-countersyncd-backport-cleanup
Mar 13, 2026
Merged

[countersyncd]: fix 202412 backport cleanup regressions#215
Pterosaur merged 1 commit intoAzure:202412from
Pterosaur:fix/202412-countersyncd-backport-cleanup

Conversation

@Pterosaur
Copy link

What I did

Fix follow-up cleanup regressions in the recent countersyncd 202412 backports.

Specifically:

  • remove stale object_names_map updates left behind after the object_id_name_map conversion in ipfix.rs
  • update ipfix.rs tests to use the current IPFixTemplatesMessage::new(..., object_names, object_ids) signature
  • update the stale-mapping test to validate object_id_name_map
  • mark legacy SwssActor wrapper helpers as #[cfg(test)] so non-test builds do not fail under RUSTFLAGS=-Dwarnings

Why I did it

The recent 202412 backport stack for sonic-net/sonic-swss PRs 4316/4317/4318/4319 had two cleanup gaps:

  1. #4318 backport (41c6d27b) renamed the actor field to object_id_name_map but left stale object_names_map references in ipfix.rs and related tests.
  2. #4319 backport (4150bafc) introduced static helper paths in swss.rs while leaving older instance wrapper methods only used by tests, which trips dead_code when building with RUSTFLAGS=-Dwarnings.

This PR makes the 202412 branch compile and test cleanly again.

How I verified it

In a CI-like sonic-slave-bookworm container:

RUSTFLAGS=-Dwarnings cargo test --locked --manifest-path crates/countersyncd/Cargo.toml

Result:

  • unit/integration/doc tests passed
  • exit code 0

Details if related

This is a fix-up for the recent 202412 backports corresponding to:

Signed-off-by: Ze Gan <ganze718@gmail.com>
@Pterosaur Pterosaur requested a review from prsunny as a code owner March 13, 2026 12:53
@Pterosaur Pterosaur merged commit 46f6ea4 into Azure:202412 Mar 13, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant