Skip to content

[ssw][ha][202511] cherry-pick custom_bfd changes#4114

Merged
vmittal-msft merged 2 commits intosonic-net:202511from
zjswhhh:202511
Jan 9, 2026
Merged

[ssw][ha][202511] cherry-pick custom_bfd changes#4114
vmittal-msft merged 2 commits intosonic-net:202511from
zjswhhh:202511

Conversation

@zjswhhh
Copy link
Copy Markdown
Contributor

@zjswhhh zjswhhh commented Jan 9, 2026

Cherry-pick:

85412005 [vnetorch] missing handling of rx and tx interval of monitoring session  (#3878)
b88a5c20 [ssw][ha] introducing `custom_bfd` and BfdMonitorOrch to support primary/secondary NHG switchover (#3922)

What I did
Today vnetorch only supports:

custom monitoring sessions with primary & secondary NHG. bfd monitoring with primary NHG only.
To make HA work we need bfd monitoring to support primary+secondary. This PR is to introduce a new monitoring type custom_bfd for that purpose. It will:

create bfd sessions for both primary & secondary endpoints listen on state db for bfd session state update
ignore update call from bfdorch
switch and update nhg based on bfd session state
It's not an elegant design to introduce a new bfd monitoring type. But the intention is to not break current functionality of vnetorch. Refactor of the code will be needed in future.

What I did

Why I did it

How I verified it

Details if related

@zjswhhh zjswhhh requested a review from prsunny as a code owner January 9, 2026 01:23
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

update_bfd_session_state(dvs, '9.1.0.3', 'Up')
update_bfd_session_state(dvs, '9.1.0.4', 'Up')
time.sleep(2)
route1 = vnet_obj.check_priority_vnet_ecmp_routes(dvs, vnet_name, ['9.1.0.1','9.1.0.2'], tunnel_name, route_ids=route1)

Check notice

Code scanning / CodeQL

Unused local variable Note test

Variable route1 is not used.
@zjswhhh zjswhhh changed the title [ssw][ha] introducing custom_bfd and BfdMonitorOrch to support primary/secondary NHG switchover #3922 [ssw][ha][202511] cherry-pick custom_bfd changes Jan 9, 2026
zjswhhh and others added 2 commits January 9, 2026 01:32
…on (sonic-net#3878)

What I did
Adding rx_monitor_timer and tx_monitor_timer handling per HLD: https://github.com/sonic-net/SONiC/blob/master/doc/vxlan/Overlay%20ECMP%20ehancements.md

sign-off: Jing Zhang zhangjing@microsoft.com

Why I did it
It's needed for SSW HA scenario as DPU side bfd is a software solution, interval must be set to a reasonable value.

Signed-off-by: Jing Zhang <zhangjing@microsoft.com>
…ary/secondary NHG switchover (sonic-net#3922)

What I did
Today vnetorch only supports:

custom monitoring sessions with primary & secondary NHG.
bfd monitoring with primary NHG only.
To make HA work we need bfd monitoring to support primary+secondary. This PR is to introduce a new monitoring type custom_bfd for that purpose. It will:

create bfd sessions for both primary & secondary endpoints
listen on state db for bfd session state update
ignore update call from bfdorch
switch and update nhg based on bfd session state
It's not an elegant design to introduce a new bfd monitoring type. But the intention is to not break current functionality of vnetorch. Refactor of the code will be needed in future.

Signed-off-by: Jing Zhang <zhangjing@microsoft.com>
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@zjswhhh zjswhhh requested a review from yue-fred-gao January 9, 2026 01:33
@zjswhhh
Copy link
Copy Markdown
Contributor Author

zjswhhh commented Jan 9, 2026

Hi @vmittal-msft - can you help merge this?

@vmittal-msft vmittal-msft merged commit 16b955a into sonic-net:202511 Jan 9, 2026
16 checks passed
@zjswhhh zjswhhh deleted the 202511 branch January 12, 2026 04:24
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.

4 participants