Skip to content

fix: enhance routeCheck toggle logic#21614

Merged
auspham merged 1 commit intosonic-net:masterfrom
cyw233:further-enhance-route-check-logic
Dec 11, 2025
Merged

fix: enhance routeCheck toggle logic#21614
auspham merged 1 commit intosonic-net:masterfrom
cyw233:further-enhance-route-check-logic

Conversation

@cyw233
Copy link
Copy Markdown
Contributor

@cyw233 cyw233 commented Dec 9, 2025

Description of PR

Further enhance the routeCheck monitor disable-and-enable logic:

  • Users can choose which topologies apply the disable-and-enable routeCheck behavior
  • Use wait_until() timeout to verify the routeCheck status is as expected before proceeding to the next step

Summary:
Fixes # (issue) Microsoft ADO 36101536

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202205
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511

Approach

What is the motivation for this PR?

This is a follow-up PR of #21582. Not all platforms need the "temporarily disable roureCheck monitor" feature, and the routeCheck monitor will take some time to startup after running sudo monit start routeCheck on some platforms. Therefore, we want to allow the users to choose which topologies they want to apply the disable-and-enable routeCheck behavior (Now only T2, LT2 & UT2 are allowed). Besides, we added a wait_until() timeout to verify the routeCheck status is as expected before proceeding to the next step.

How did you do it?

How did you verify/test it?

I verified it on a T0 platform and I can confirm this logic will be skipped: https://elastictest.org/scheduler/testplan/69389f2d392767e9bf67ef1a

image image

I also verified on a T2 platform and I can confirm this logic is applied there: https://elastictest.org/scheduler/testplan/69389e7794f9e10e4c224c66

image image

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@cyw233 cyw233 requested review from a team and wangxin as code owners December 9, 2025 10:15
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@cyw233
Copy link
Copy Markdown
Contributor Author

cyw233 commented Dec 9, 2025

/azpw run

@mssonicbld
Copy link
Copy Markdown
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Copy Markdown
Contributor

@ZhaohuiS ZhaohuiS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@cyw233 cyw233 force-pushed the further-enhance-route-check-logic branch from a3c058b to 7a6880d Compare December 10, 2025 00:56
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@github-actions github-actions bot requested a review from ZhaohuiS December 10, 2025 00:56
@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@cyw233 cyw233 force-pushed the further-enhance-route-check-logic branch from 7a6880d to 9a2d1dc Compare December 11, 2025 00:11
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@auspham auspham merged commit 024f973 into sonic-net:master Dec 11, 2025
21 checks passed
@mssonicbld
Copy link
Copy Markdown
Collaborator

@cyw233 PR conflicts with 202511 branch

@mssonicbld
Copy link
Copy Markdown
Collaborator

Cherry-pick PR to msft-202405: Azure/sonic-mgmt.msft#931

@cyw233
Copy link
Copy Markdown
Contributor Author

cyw233 commented Dec 12, 2025

Auto cherry pick PR has conflict.
Manual cherry-pick PR to msft-202405: Azure/sonic-mgmt.msft#932

saravanan-nexthop pushed a commit to saravanan-nexthop/sonic-mgmt that referenced this pull request Dec 15, 2025
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 16, 2025
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: Guy Shemesh <[email protected]>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: Aharon Malkin <[email protected]>
nissampa pushed a commit to nissampa/sonic-mgmt_dpu_test that referenced this pull request Dec 16, 2025
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: Nishanth Sampath Kumar <[email protected]>
selldinesh pushed a commit to selldinesh/sonic-mgmt that referenced this pull request Dec 18, 2025
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: selldinesh <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: Guy Shemesh <[email protected]>
vrajeshe pushed a commit to Akshath-17/sonic-mgmt that referenced this pull request Jan 4, 2026
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: Venkata Gouri Rajesh Etla <[email protected]>
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Jan 13, 2026
yifan-nexthop pushed a commit to nexthop-ai/sonic-mgmt that referenced this pull request Jan 14, 2026
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: YiFan Wang <[email protected]>
PriyanshTratiya pushed a commit to PriyanshTratiya/sonic-mgmt that referenced this pull request Jan 21, 2026
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: Priyansh Tratiya <[email protected]>
lakshmi-nexthop pushed a commit to lakshmi-nexthop/sonic-mgmt that referenced this pull request Jan 28, 2026
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: Lakshmi Yarramaneni <[email protected]>
ytzur1 pushed a commit to ytzur1/sonic-mgmt that referenced this pull request Feb 2, 2026
abhishek-nexthop pushed a commit to nexthop-ai/sonic-mgmt that referenced this pull request Feb 6, 2026
vmittal-msft pushed a commit that referenced this pull request Feb 6, 2026
Signed-off-by: Chenyang Wang <[email protected]>
Co-authored-by: Chenyang Wang <[email protected]>
lakshmi-nexthop pushed a commit to lakshmi-nexthop/sonic-mgmt that referenced this pull request Feb 11, 2026
Signed-off-by: Chenyang Wang <[email protected]>
Co-authored-by: Chenyang Wang <[email protected]>
Signed-off-by: Lakshmi Yarramaneni <[email protected]>
rraghav-cisco pushed a commit to rraghav-cisco/sonic-mgmt that referenced this pull request Feb 13, 2026
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: Raghavendran Ramanathan <[email protected]>
anilal-amd pushed a commit to anilal-amd/anilal-forked-sonic-mgmt that referenced this pull request Feb 19, 2026
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: Zhuohui Tan <[email protected]>
abhishek-nexthop pushed a commit to nexthop-ai/sonic-mgmt that referenced this pull request Mar 17, 2026
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Mar 27, 2026
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.

4 participants