jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-19 15:16:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reset failed API call counter on successful API call (#4862)

Browse Source 
* Reset failed API call counter on successful API call

Make sure to reset the failed API call counter after a successful
API call. While at it also update the log messages a bit to make it
clearer what the problem is exactly.

* Address pytest changes
This commit is contained in:
Stefan Agner 2024-01-31 17:41:21 +01:00 committed by GitHub
parent 765265723c
commit 190894010c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
supervisor/misc/tasks.py
View File

@ -16,8 +16,9 @@ from ..utils.sentry import capture_exception
_LOGGER: logging.Logger = logging.getLogger(__name__) _LOGGER: logging.Logger = logging.getLogger(__name__)
HASS_WATCHDOG_API = "HASS_WATCHDOG_API" HASS_WATCHDOG_API_FAILURES = "HASS_WATCHDOG_API_FAILURES"
HASS_WATCHDOG_REANIMATE_FAILURES = "HASS_WATCHDOG_REANIMATE_FAILURES" HASS_WATCHDOG_REANIMATE_FAILURES = "HASS_WATCHDOG_REANIMATE_FAILURES"
HASS_WATCHDOG_MAX_API_ATTEMPTS = 2
HASS_WATCHDOG_MAX_REANIMATE_ATTEMPTS = 5 HASS_WATCHDOG_MAX_REANIMATE_ATTEMPTS = 5
RUN_UPDATE_SUPERVISOR = 29100 RUN_UPDATE_SUPERVISOR = 29100
@ -169,6 +170,7 @@ class Tasks(CoreSysAttributes):
if await self.sys_homeassistant.api.check_api_state(): if await self.sys_homeassistant.api.check_api_state():
# Home Assistant is running properly # Home Assistant is running properly
self._cache[HASS_WATCHDOG_REANIMATE_FAILURES] = 0 self._cache[HASS_WATCHDOG_REANIMATE_FAILURES] = 0
self._cache[HASS_WATCHDOG_API_FAILURES] = 0
return return
# Give up after 5 reanimation failures in a row. Supervisor cannot fix this issue. # Give up after 5 reanimation failures in a row. Supervisor cannot fix this issue.
@ -176,23 +178,26 @@ class Tasks(CoreSysAttributes):
if reanimate_fails >= HASS_WATCHDOG_MAX_REANIMATE_ATTEMPTS: if reanimate_fails >= HASS_WATCHDOG_MAX_REANIMATE_ATTEMPTS:
if reanimate_fails == HASS_WATCHDOG_MAX_REANIMATE_ATTEMPTS: if reanimate_fails == HASS_WATCHDOG_MAX_REANIMATE_ATTEMPTS:
_LOGGER.critical( _LOGGER.critical(
"Watchdog cannot reanimate Home Assistant, failed all %s attempts.", "Watchdog cannot reanimate Home Assistant Core, failed all %s attempts.",
reanimate_fails, reanimate_fails,
) )
self._cache[HASS_WATCHDOG_REANIMATE_FAILURES] += 1 self._cache[HASS_WATCHDOG_REANIMATE_FAILURES] += 1
return return
# Init cache data # Init cache data
retry_scan = self._cache.get(HASS_WATCHDOG_API, 0) api_fails = self._cache.get(HASS_WATCHDOG_API_FAILURES, 0)
# Look like we run into a problem # Look like we run into a problem
retry_scan += 1 api_fails += 1
if retry_scan == 1: if api_fails < HASS_WATCHDOG_MAX_API_ATTEMPTS:
self._cache[HASS_WATCHDOG_API] = retry_scan self._cache[HASS_WATCHDOG_API_FAILURES] = api_fails
_LOGGER.warning("Watchdog miss API response from Home Assistant") _LOGGER.warning("Watchdog missed an Home Assistant Core API response.")
return return
_LOGGER.error("Watchdog found a problem with Home Assistant API!") _LOGGER.error(
"Watchdog missed %s Home Assistant Core API responses in a row. Restarting Home Assistant Core API!",
HASS_WATCHDOG_MAX_API_ATTEMPTS,
)
try: try:
await self.sys_homeassistant.core.restart() await self.sys_homeassistant.core.restart()
except HomeAssistantError as err: except HomeAssistantError as err:
@ -203,7 +208,7 @@ class Tasks(CoreSysAttributes):
else: else:
self._cache[HASS_WATCHDOG_REANIMATE_FAILURES] = 0 self._cache[HASS_WATCHDOG_REANIMATE_FAILURES] = 0
finally: finally:
self._cache[HASS_WATCHDOG_API] = 0 self._cache[HASS_WATCHDOG_API_FAILURES] = 0
@Job(name="tasks_update_cli", conditions=PLUGIN_AUTO_UPDATE_CONDITIONS) @Job(name="tasks_update_cli", conditions=PLUGIN_AUTO_UPDATE_CONDITIONS)
async def _update_cli(self): async def _update_cli(self):

18
tests/misc/test_tasks.py
View File

@ -34,15 +34,21 @@ async def test_watchdog_homeassistant_api(
await tasks._watchdog_homeassistant_api() await tasks._watchdog_homeassistant_api()
restart.assert_not_called() restart.assert_not_called()
assert "Watchdog miss API response from Home Assistant" in caplog.text assert "Watchdog missed an Home Assistant Core API response." in caplog.text
assert "Watchdog found a problem with Home Assistant API!" not in caplog.text assert (
"Watchdog missed 2 Home Assistant Core API responses in a row. Restarting Home Assistant Core API!"
not in caplog.text
)
caplog.clear() caplog.clear()
await tasks._watchdog_homeassistant_api() await tasks._watchdog_homeassistant_api()
restart.assert_called_once() restart.assert_called_once()
assert "Watchdog miss API response from Home Assistant" not in caplog.text assert "Watchdog missed an Home Assistant Core API response." not in caplog.text
assert "Watchdog found a problem with Home Assistant API!" in caplog.text assert (
"Watchdog missed 2 Home Assistant Core API responses in a row. Restarting Home Assistant Core API!"
in caplog.text
)
async def test_watchdog_homeassistant_api_off(tasks: Tasks, coresys: CoreSys): async def test_watchdog_homeassistant_api_off(tasks: Tasks, coresys: CoreSys):
@ -120,10 +126,10 @@ async def test_watchdog_homeassistant_api_reanimation_limit(
await tasks._watchdog_homeassistant_api() await tasks._watchdog_homeassistant_api()
restart.assert_not_called() restart.assert_not_called()
assert "Watchdog miss API response from Home Assistant" not in caplog.text assert "Watchdog missed an Home Assistant Core API response." not in caplog.text
assert "Watchdog found a problem with Home Assistant API!" not in caplog.text assert "Watchdog found a problem with Home Assistant API!" not in caplog.text
assert ( assert (
"Watchdog cannot reanimate Home Assistant, failed all 5 attempts." "Watchdog cannot reanimate Home Assistant Core, failed all 5 attempts."
in caplog.text in caplog.text
) )