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] Use interval set in thermal policy if available #164

Merged
merged 6 commits into from
Aug 6, 2021
Merged

[thermalctld] Use interval set in thermal policy if available #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d865a09
Use thermal policy interval in thermalctld
andywongarista Mar 6, 2021
7618176
Merge branch 'master' into master-thermalctld-interval
andywongarista Mar 22, 2021
91ba5fc
Merge branch 'master' into master-thermalctld-interval
andywongarista Apr 16, 2021
20be710
Merge remote-tracking branch 'upstream/master' into master-thermalctl…
andywongarista Jun 30, 2021
0e5ec0c
Fix test_thermalctld to handle thermal_manager.get_interval
andywongarista Jun 30, 2021
d81df6e
Additional fix for test_thermalctld to handle thermal_manager.get_int…
andywongarista Jul 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
7 changes: 5 additions & 2 deletions sonic-thermalctld/scripts/thermalctld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,8 @@ class ThermalControlDaemon(daemon_base.DaemonBase):
self.thermal_manager.initialize()
self.thermal_manager.load(ThermalControlDaemon.POLICY_FILE)
self.thermal_manager.init_thermal_algorithm(self.chassis)
# Use thermal manager interval if it's available
self.wait_time = self.thermal_manager.get_interval()
except NotImplementedError:
self.log_warning('Thermal manager is not supported on this platform')
except Exception as e:
Expand Down Expand Up @@ -832,9 +834,10 @@ class ThermalControlDaemon(daemon_base.DaemonBase):
except Exception as e:
self.log_error('Caught exception while running thermal policy - {}'.format(repr(e)))

interval = self.thermal_manager.get_interval() if self.thermal_manager else self.INTERVAL
elapsed = time.time() - begin
if elapsed < self.INTERVAL:
self.wait_time = self.INTERVAL - elapsed
if elapsed < interval:
self.wait_time = interval - elapsed
else:
self.wait_time = self.FAST_START_INTERVAL

Expand Down
2 changes: 2 additions & 0 deletions sonic-thermalctld/tests/test_thermalctld.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,12 +651,14 @@ def test_signal_handler():
def test_daemon_run():
daemon_thermalctld = thermalctld.ThermalControlDaemon()
daemon_thermalctld.stop_event.wait = mock.MagicMock(return_value=True)
daemon_thermalctld.thermal_manager.get_interval = mock.MagicMock(return_value=60)
ret = daemon_thermalctld.run()
daemon_thermalctld.deinit() # Deinit becuase the test will hang if we assert
assert ret is False

daemon_thermalctld = thermalctld.ThermalControlDaemon()
daemon_thermalctld.stop_event.wait = mock.MagicMock(return_value=False)
daemon_thermalctld.thermal_manager.get_interval = mock.MagicMock(return_value=60)
ret = daemon_thermalctld.run()
daemon_thermalctld.deinit() # Deinit becuase the test will hang if we assert
assert ret is True
Expand Down