Skip to content

Fix issue: pmon services's restart count is not cleared during config reload #4314

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

Open
stephenxs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue: pmon services's restart count is not cleared during config reload #4314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,14 +1005,21 @@ def _stop_services():
clicommon.run_command(['sudo', 'systemctl', 'stop', 'sonic.target', '--job-mode', 'replace-irreversibly'])


def _get_sonic_services():
def _get_sonic_services(reverse=False):
cmd = ['systemctl', 'list-dependencies', '--plain', 'sonic.target']
if reverse:
cmd.append('--reverse')

out, _ = clicommon.run_command(cmd, return_cmd=True)
out = out.strip().split('\n')[1:]
return (unit.strip() for unit in out)


def _reset_failed_services():
for service in _get_sonic_services():
services = set(_get_sonic_services())
services.update(set(_get_sonic_services(True)))

for service in services:
clicommon.run_command(['systemctl', 'reset-failed', str(service)])


Expand Down
6 changes: 3 additions & 3 deletions tests/config_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@ def test_load_minigraph(self, mock_check_call, get_cmd_module, setup_single_broa
(load_minigraph_command_output.format(config.SYSTEM_RELOAD_LOCK))
# Verify "systemctl reset-failed" is called for services under sonic.target
mock_run_command.assert_any_call(['systemctl', 'reset-failed', 'swss'])
assert mock_run_command.call_count == 19
assert mock_run_command.call_count == 20

@mock.patch('sonic_py_common.device_info.get_paths_to_platform_and_hwsku_dirs',
mock.MagicMock(return_value=("dummy_path", None)))
Expand Down Expand Up @@ -1111,7 +1111,7 @@ def test_load_minigraph_bypass_lock(self, get_cmd_module, setup_single_broadcom_
assert result.exit_code == 0
assert result.output == \
load_minigraph_command_bypass_lock_output.format(config.SYSTEM_RELOAD_LOCK)
assert mock_run_command.call_count == 15
assert mock_run_command.call_count == 16
finally:
flock.release_flock(fd)

Expand All @@ -1129,7 +1129,7 @@ def test_load_minigraph_platform_plugin(self, get_cmd_module, setup_single_broad
(load_minigraph_platform_plugin_command_output.format(config.SYSTEM_RELOAD_LOCK))
# Verify "systemctl reset-failed" is called for services under sonic.target
mock_run_command.assert_any_call(['systemctl', 'reset-failed', 'swss'])
assert mock_run_command.call_count == 15
assert mock_run_command.call_count == 16

@mock.patch('sonic_py_common.device_info.get_paths_to_platform_and_hwsku_dirs', mock.MagicMock(return_value=(load_minigraph_platform_false_path, None)))
def test_load_minigraph_platform_plugin_fail(self, get_cmd_module, setup_single_broadcom_asic):
Expand Down
Loading