Skip to content

[nexthop] watchdog implementation: temporary workaround to arm 2 watchdogs - #28518

Merged
Praveen-Brcm merged 2 commits into
sonic-net:masterfrom
nexthop-ai:domingo.watchdog-temp-workaround
Jul 31, 2026
Merged

[nexthop] watchdog implementation: temporary workaround to arm 2 watchdogs#28518
Praveen-Brcm merged 2 commits into
sonic-net:masterfrom
nexthop-ai:domingo.watchdog-temp-workaround

Conversation

@domingo-nexthop

@domingo-nexthop domingo-nexthop commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

Why I did it

This is a temporary workaround to arm hardware watchdog that triggers power cycle. The workaround is needed until full SW support of both watchdog 1 and 2.

Also updates the arm value to 300 seconds as this is what platform_tests
/test_hw_watchdog.py
expects

Work item tracking
  • Microsoft ADO (number only):

How I did it

Arm watchdog 2 by writing to 0x1d8 register before arming watchdog 1.

How to verify it

Arm watchdog using watchdogutil. sonic-mgmt test tests/platform_tests/api/test_watchdog.py

Which release branch to backport (provide reason below if selected)

  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511
  • 202512
  • 202605
  • 202608

Tracking issue/work item for backport/cherry-pick request (GitHub issue or Microsoft ADO):
Failure type:

Tested branch

  • master
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511
  • 202512
  • 202605
  • 202608
  • N/A

Test result

sudo watchdogutil status
sudo watchdogutil arm -s 10
sudo watchdogutil status
sudo watchdogutil disarm

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: domingo-nexthop <domingo@nexthop.ai>
@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines

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

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).

@mssonicbld

Copy link
Copy Markdown
Collaborator

This PR has backport request for branch(es): 202512.
Added label(s) for branch(es) msft-202512.

---Powered by SONiC BuildBot

@mssonicbld

Copy link
Copy Markdown
Collaborator

This PR has backport request label(s) for branch(es): msft-202512, but is missing required test information. Please make sure you tick the tested branch(es) in the Tested branch section and provide test evidence (e.g., 202512: <test result>) in the Test result section as well in your PR description.

---Powered by SONiC BuildBot

Signed-off-by: domingo-nexthop <domingo@nexthop.ai>
@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).

@domingo-nexthop domingo-nexthop changed the title [nexthop] arm 2 watchdogs [nexthop] watchdog implementation: temporary workaround to arm 2 watchdogs Jul 22, 2026
@domingo-nexthop
domingo-nexthop marked this pull request as ready for review July 22, 2026 00:50
@domingo-nexthop
domingo-nexthop requested a review from lguohan as a code owner July 22, 2026 00:50
@azure-pipelines

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

@mssonicbld

Copy link
Copy Markdown
Collaborator

This PR has backport request for branch(es): 202511,202512,202605.

Request label(s) for branch(es) msft-202512 already exists.
Added label(s) for branch(es) 202511,202605.

---Powered by SONiC BuildBot

@mssonicbld

Copy link
Copy Markdown
Collaborator

This PR has backport request label(s) for branch(es): 202511,202605, but is missing required test information. Please make sure you tick the tested branch(es) in the Tested branch section and provide test evidence (e.g., 202511: <test result>) in the Test result section as well in your PR description.

---Powered by SONiC BuildBot

@bingwang-ms

bingwang-ms commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

@deerao02 Can you help review and check the fix can fix the test failure we discussed?

@deerao02 deerao02 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

After I applied this patch and tried on the DUT, the originally failing tests passed but it also caused some instability. The arm-cycle tests now crash the  platform_api_server. The workaround might need hardening

@Praveen-Brcm
Praveen-Brcm merged commit aabecd9 into sonic-net:master Jul 31, 2026
17 checks passed
nh-grecs Bot pushed a commit to nexthop-ai/sonic-buildimage.msft that referenced this pull request Aug 7, 2026
…hdogs (#28518)

* temporary workaround to arm watchdog power cycle countdown

Signed-off-by: domingo-nexthop <domingo@nexthop.ai>

* arm watchdog with 300 seconds instead of 360

Signed-off-by: domingo-nexthop <domingo@nexthop.ai>

---------

Signed-off-by: domingo-nexthop <domingo@nexthop.ai>

rebuild-source: sonic-net/sonic-buildimage#28518 @ aabecd9 [case: upstream:merged]
@mssonicbld

Copy link
Copy Markdown
Collaborator

Cherry-pick PR to msft-202512: Azure/sonic-buildimage-msft#2883

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.

7 participants