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.

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

[thermalctld] Initialize fan led in thermalctld for the first run #167

Merged
merged 1 commit into from
Mar 22, 2021
Merged

[thermalctld] Initialize fan led in thermalctld for the first run #167

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
19 changes: 10 additions & 9 deletions sonic-thermalctld/scripts/thermalctld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class FanStatus(logger.Logger):
self.under_speed = False
self.over_speed = False
self.invalid_direction = False
self.led_initialized = False

@classmethod
def get_bad_fan_count(cls):
Expand Down Expand Up @@ -315,7 +316,7 @@ class FanUpdater(logger.Logger):
fan_fault_status = try_get(fan.get_status, False)
fan_direction = try_get(fan.get_direction)

set_led = False
set_led = not fan_status.led_initialized
if fan_status.set_presence(presence):
set_led = True
self._log_on_status_changed(fan_status.presence,
Expand Down Expand Up @@ -383,16 +384,16 @@ class FanUpdater(logger.Logger):
:return:
"""
try:
if fan_status.is_ok():
fan.set_status_led(fan.STATUS_LED_COLOR_GREEN)
fan_drawer.set_status_led(fan.STATUS_LED_COLOR_GREEN)
else:
# TODO: wait for Kebo to define the mapping of fan status to led color,
# just set it to red so far
fan.set_status_led(fan.STATUS_LED_COLOR_RED)
fan_drawer.set_status_led(fan.STATUS_LED_COLOR_RED)
led_color = fan.STATUS_LED_COLOR_GREEN if fan_status.is_ok() else fan.STATUS_LED_COLOR_RED
fan.set_status_led(led_color)
fan_drawer.set_status_led(led_color)
except NotImplementedError as e:
self.log_warning('Failed to set status LED for fan {}, set_status_led not implemented'.format(fan_name))

# Set led_initialized to True even if there is NotImplementedError as it is not neccessary to
# print the warning log again and again. But if there is other exception, we could not
# reach this line, and it will retry setting led color in the next run.
fan_status.led_initialized = True

def _update_led_color(self):
for fan_name, fan_status in self.fan_status_dict.items():
Expand Down