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] Fix issue: fan status should not be True when fan is absent #92

Merged
merged 1 commit into from
Sep 15, 2020
Merged

[thermalctld] Fix issue: fan status should not be True when fan is absent #92

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
5 changes: 4 additions & 1 deletion sonic-thermalctld/scripts/thermalctld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,12 +311,15 @@ class FanUpdater(logger.Logger):
if not is_psu_fan:
self._set_fan_led(fan_drawer, fan, fan_name, fan_status)

if fan_fault_status != NOT_AVAILABLE:
fan_fault_status = fan_status.is_ok()

fvs = swsscommon.FieldValuePairs(
[('presence', str(presence)),
('drawer_name', drawer_name),
('model', str(try_get(fan.get_model))),
('serial', str(try_get(fan.get_serial))),
('status', str(fan_fault_status and not(fan_status.under_speed or fan_status.over_speed))),
('status', str(fan_fault_status)),
('direction', str(fan_direction)),
('speed', str(speed)),
('speed_tolerance', str(speed_tolerance)),
Expand Down