Skip to content

[code sync] Merge code from sonic-net/sonic-utilities:202511 to 202603 #298

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.

Sign up for GitHub

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

Merged
mssonicbld merged 2 commits into from
Apr 1, 2026
Merged

[code sync] Merge code from sonic-net/sonic-utilities:202511 to 202603 #298

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fd05d5
[config reload] Skip routeCheck monit calls on DPU platforms (#4410)
mssonicbld Apr 1, 2026
706b311
Merge branch '202511' of https://github.com/sonic-net/sonic-utilities…
mssonicbld Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,12 +986,25 @@ def _get_disabled_services_list(config_db):
return disabled_services_list


def _monit_service_exists(service):
"""Return True if monit knows about the given service."""
try:
subprocess.check_call(
['sudo', 'monit', 'status', service],
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
)
return True
except subprocess.CalledProcessError:
return False


def _stop_services():
try:
subprocess.check_call(['sudo', 'monit', 'status'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
click.echo("Disabling container and routeCheck monitoring ...")
clicommon.run_command(['sudo', 'monit', 'unmonitor', 'container_checker'])
clicommon.run_command(['sudo', 'monit', 'unmonitor', 'routeCheck'])
if _monit_service_exists('routeCheck'):
clicommon.run_command(['sudo', 'monit', 'unmonitor', 'routeCheck'])
except subprocess.CalledProcessError as err:
pass

Expand Down Expand Up @@ -1080,10 +1093,13 @@ def _restart_services():
try:
subprocess.check_call(['sudo', 'monit', 'status'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
click.echo("Enabling container and routeCheck monitoring ...")
clicommon.run_command(['sudo', 'monit', 'monitor', 'routeCheck'])
has_route_check = _monit_service_exists('routeCheck')
if has_route_check:
clicommon.run_command(['sudo', 'monit', 'monitor', 'routeCheck'])
clicommon.run_command(['sudo', 'monit', 'monitor', 'container_checker'])
log.log_notice("Waiting for monit monitor actions to complete ...")
_wait_for_monit_service_monitored('routeCheck')
if has_route_check:
_wait_for_monit_service_monitored('routeCheck')
_wait_for_monit_service_monitored('container_checker')
except subprocess.CalledProcessError as err:
pass
Expand Down
Loading