Skip to content

[container_checker] Exclude the 'always_disabled' container from expected running container list #7217

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 2 commits into from
Apr 2, 2021
Merged

[container_checker] Exclude the 'always_disabled' container from expected running container list #7217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27726ec
[container_checker] Exclude the 'always_disabled' container from the
yozhao101 Apr 2, 2021
3fa3d79
[container_checker] Simplify the if statement at the line 66.
yozhao101 Apr 2, 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
10 changes: 5 additions & 5 deletions files/image_config/monit/container_checker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ def get_command_result(command):
def get_expected_running_containers():
"""
@summary: This function will get the expected running containers by following the rule:
The 'state' field of container in 'FEATURE' table should not be 'disabled'. Then
if the device has Multi-ASIC, this function will get container list by determining the
The 'state' field of container in 'FEATURE' table should not be 'disabled' or 'always_disabled'.
If the device has Multi-ASIC, this function will get container list by determining the
value of field 'has_global_scope', the number of ASICs and the value of field
'has_per_asic_scope'. If the device has single ASIC, the container name was put into
the list.
'has_per_asic_scope'.
If the device has single ASIC, the container name was put into the list.
@return: A set which contains the expected running containers.
"""
config_db = swsssdk.ConfigDBConnector()
Expand All @@ -62,7 +62,7 @@ def get_expected_running_containers():
expected_running_containers = set()

for container_name in feature_table.keys():
if feature_table[container_name]["state"] != "disabled":
if feature_table[container_name]["state"] not in ["disabled", "always_disabled"]:
if multi_asic.is_multi_asic():
if feature_table[container_name]["has_global_scope"] == "True":
expected_running_containers.add(container_name)
Expand Down