Skip to content

[config] Enable/disable container monitoring when starting/stopping the services. #1471

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
yozhao101 merged 8 commits into from
Mar 3, 2021
Merged

[config] Enable/disable container monitoring when starting/stopping the services. #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d81f29a
[config] Monit will unmonitor the script of container_checker before
yozhao101 Mar 1, 2021
29b8ef8
[config] Reorganize the messages.
yozhao101 Mar 2, 2021
c9e3b8c
Merge branch 'master' into prevent_false_alarming
yozhao101 Mar 2, 2021
c4cb09c
[config] Reorganize the messages.
yozhao101 Mar 2, 2021
68bb843
[config] Remove the comments.
yozhao101 Mar 2, 2021
f8d4545
[config] Remove extra blank line.
yozhao101 Mar 2, 2021
3fdc2cc
[config] Reorganize the command output.
yozhao101 Mar 2, 2021
0bc150a
[config] Update the number of messages in test file.
yozhao101 Mar 3, 2021
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
6 changes: 6 additions & 0 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,9 @@ def _get_disabled_services_list(config_db):


def _stop_services():
click.echo("Disabling container monitoring ...")
clicommon.run_command("sudo monit unmonitor container_checker")

click.echo("Stopping SONiC target ...")
clicommon.run_command("sudo systemctl stop sonic.target")

Expand All @@ -692,6 +695,9 @@ def _restart_services():
click.echo("Reloading Monit configuration ...")
clicommon.run_command("sudo monit reload")

click.echo("Enabling container monitoring ...")
clicommon.run_command("sudo monit monitor container_checker")


def interface_is_in_vlan(vlan_member_table, interface_name):
""" Check if an interface is in a vlan """
Expand Down
4 changes: 3 additions & 1 deletion tests/config_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
from utilities_common.db import Db

load_minigraph_command_output="""\
Disabling container monitoring ...
Stopping SONiC target ...
Running command: /usr/local/bin/sonic-cfggen -H -m --write-to-db
Running command: pfcwd start_default
Running command: config qos reload --no-dynamic-buffer
Restarting SONiC target ...
Reloading Monit configuration ...
Enabling container monitoring ...
Please note setting loaded from minigraph will be lost after system reboot. To preserve setting, run `config save`.
"""

Expand Down Expand Up @@ -49,7 +51,7 @@ def test_load_minigraph(self, get_cmd_module, setup_single_broadcom_asic):
traceback.print_tb(result.exc_info[2])
assert result.exit_code == 0
assert "\n".join([l.rstrip() for l in result.output.split('\n')]) == load_minigraph_command_output
assert mock_run_command.call_count == 7
assert mock_run_command.call_count == 9

@classmethod
def teardown_class(cls):
Expand Down