Skip to content

[code sync] Merge code from sonic-net/sonic-swss:202511 to 202511_azd#260

Merged
mssonicbld merged 2 commits into
Azure:202511_azdfrom
mssonicbld:sonicbld/202511_azd-merge
Jul 22, 2026
Merged

[code sync] Merge code from sonic-net/sonic-swss:202511 to 202511_azd#260
mssonicbld merged 2 commits into
Azure:202511_azdfrom
mssonicbld:sonicbld/202511_azd-merge

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator
* a7aded92 - (origin/202511) hftelorch: minor improvements and cleanups for high frequency telemetry (#4315) (#4701) (2026-07-20) [Ze Gan]<br>```

Pterosaur and others added 2 commits July 20, 2026 21:31
…ry (#4315) (#4701)

* hftelorch: remove unused macro and add SAI return value checks
What I did
A collection of minor improvements and cleanups for the high frequency telemetry orchagent code:

Add handleSaiCreateStatus() calls in createNetlinkChannel() for consistency with createTAM().
Add missing attrs.push_back() for SAI_TAM_REPORT_ATTR_REPORT_INTERVAL_UNIT.
Use find() instead of operator[] in clearGroup() to avoid inserting default entries.
Adjust clearGroup() cleanup order to delete counter subscriptions before telemetry type/report objects.
Replace raw const char* fields in CounterNameMapUpdater::Message with owned std::string state for robustness.
Initialize CounterNameMapUpdater::Message::m_oid to SAI_NULL_OBJECT_ID and keep it SET-only by contract.
Use rvalue reference for updateStatsIDs() to enable true move semantics.
Use u32 for SAI_TAM_COUNTER_SUBSCRIPTION_ATTR_STAT_ID to match the SAI metadata type.
Clean up partially created hostif objects in createNetlinkChannel() if a later HOSTIF create step fails.
Remove unused CONSTANTS_FILE macro and clean up commented-out code.
Why I did it
Identified during code review. Most of these are defensive robustness/maintainability fixes. The createNetlinkChannel() follow-up also improves failure-path behavior by avoiding leaked partially created HOSTIF objects when later create steps fail.

(cherry picked from commit f54b71e)

Signed-off-by: Ze Gan <zegan@microsoft.com>
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@mssonicbld
mssonicbld merged commit 2987002 into Azure:202511_azd Jul 22, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants