Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Nokia-7215] Enhance Watchdog service #18851

Merged
merged 1 commit into from
Jun 5, 2024

Conversation

Pavan-Nokia
Copy link
Contributor

@Pavan-Nokia Pavan-Nokia commented May 2, 2024

Mask Watchdog-control.service and make sure only one watchdog service starts on this platform

This is a backport PR for Master PR #18850

Why I did it

To resolve conflict between ordering of the 2 watchdog services.

  1. watchdog-control.service -- common service designed to disable watchdog on all platforms
  2. cpu_wdt.service -- enable Watchdog on nokia-7215 platform.

Is some cases service 1 was started after service 2 leaving the watchdog on the box disabled

Work item tracking
  • Microsoft ADO (number only):

How I did it

Enhance service file to assure cpu_wdt.service always starts after watchdog-control.service

How to verify it

  1. Try multiple upgrades and install scenario to make sure watchdog is always in enabled state
  2. Try multiple reboots to make sure watchdog is always in enabled state
admin@sonic:~$ systemctl status watchdog-control.service 
â—� watchdog-control.service
     Loaded: masked (Reason: Unit watchdog-control.service is masked.)
     Active: inactive (dead)
admin@sonic:~$ 
admin@sonic:~$ 
admin@sonic:~$ systemctl status cpu_wdt.service
â—� cpu_wdt.service - CPU WDT
     Loaded: loaded (/etc/systemd/system/cpu_wdt.service; enabled; vendor prese>
     Active: active (running) since Mon 2024-05-20 14:57:15 UTC; 4min 57s ago
   Main PID: 635 (cpu_wdt.py)
      Tasks: 1 (limit: 4915)
     Memory: 13.9M
     CGroup: /system.slice/cpu_wdt.service
             └─635 /usr/bin/python /usr/local/bin/cpu_wdt.py

admin@sonic:~$ 

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

@Pavan-Nokia Pavan-Nokia requested a review from lguohan as a code owner May 2, 2024 14:21
@Pavan-Nokia Pavan-Nokia force-pushed the dev_enhance_watchdog branch 2 times, most recently from 727da7f to 5f54d24 Compare May 20, 2024 15:23
Mask Watchdog-control.service and make sure only one watchdog service
starts on this platform
@yxieca yxieca merged commit cba1a69 into sonic-net:202311 Jun 5, 2024
11 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.

2 participants