Intelligent timeout handler for setup/bootstrap (#38329)
Co-authored-by: Paulus Schoutsen <balloob@gmail.com> Co-authored-by: J. Nick Koston <nick@koston.org>
This commit is contained in:
21 files changed
+901
-89
No files matched your search
+27
-7
@@ -35,7 +35,6 @@ from typing import (
|
||||
)
|
||||
import uuid
|
||||
|
||||
from async_timeout import timeout
|
||||
import attr
|
||||
import voluptuous as vol
|
||||
import yarl
|
||||
@@ -76,6 +75,7 @@ from homeassistant.util import location, network
|
||||
from homeassistant.util.async_ import fire_coroutine_threadsafe, run_callback_threadsafe
|
||||
import homeassistant.util.dt as dt_util
|
||||
from homeassistant.util.thread import fix_threading_exception_logging
|
||||
from homeassistant.util.timeout import TimeoutManager
|
||||
from homeassistant.util.unit_system import IMPERIAL_SYSTEM, METRIC_SYSTEM, UnitSystem
|
||||
|
||||
# Typing imports that create a circular dependency
|
||||
@@ -184,10 +184,12 @@ class HomeAssistant:
|
||||
self.helpers = loader.Helpers(self)
|
||||
# This is a dictionary that any component can store any data on.
|
||||
self.data: dict = {}
|
||||
self.state = CoreState.not_running
|
||||
self.exit_code = 0
|
||||
self.state: CoreState = CoreState.not_running
|
||||
self.exit_code: int = 0
|
||||
# If not None, use to signal end-of-loop
|
||||
self._stopped: Optional[asyncio.Event] = None
|
||||
# Timeout handler for Core/Helper namespace
|
||||
self.timeout: TimeoutManager = TimeoutManager()
|
||||
|
||||
@property
|
||||
def is_running(self) -> bool:
|
||||
@@ -255,7 +257,7 @@ class HomeAssistant:
|
||||
try:
|
||||
# Only block for EVENT_HOMEASSISTANT_START listener
|
||||
self.async_stop_track_tasks()
|
||||
async with timeout(TIMEOUT_EVENT_START):
|
||||
async with self.timeout.async_timeout(TIMEOUT_EVENT_START):
|
||||
await self.async_block_till_done()
|
||||
except asyncio.TimeoutError:
|
||||
_LOGGER.warning(
|
||||
@@ -460,17 +462,35 @@ class HomeAssistant:
|
||||
self.state = CoreState.stopping
|
||||
self.async_track_tasks()
|
||||
self.bus.async_fire(EVENT_HOMEASSISTANT_STOP)
|
||||
await self.async_block_till_done()
|
||||
try:
|
||||
async with self.timeout.async_timeout(120):
|
||||
await self.async_block_till_done()
|
||||
except asyncio.TimeoutError:
|
||||
_LOGGER.warning(
|
||||
"Timed out waiting for shutdown stage 1 to complete, the shutdown will continue"
|
||||
)
|
||||
|
||||
# stage 2
|
||||
self.state = CoreState.final_write
|
||||
self.bus.async_fire(EVENT_HOMEASSISTANT_FINAL_WRITE)
|
||||
await self.async_block_till_done()
|
||||
try:
|
||||
async with self.timeout.async_timeout(60):
|
||||
await self.async_block_till_done()
|
||||
except asyncio.TimeoutError:
|
||||
_LOGGER.warning(
|
||||
"Timed out waiting for shutdown stage 2 to complete, the shutdown will continue"
|
||||
)
|
||||
|
||||
# stage 3
|
||||
self.state = CoreState.not_running
|
||||
self.bus.async_fire(EVENT_HOMEASSISTANT_CLOSE)
|
||||
await self.async_block_till_done()
|
||||
try:
|
||||
async with self.timeout.async_timeout(30):
|
||||
await self.async_block_till_done()
|
||||
except asyncio.TimeoutError:
|
||||
_LOGGER.warning(
|
||||
"Timed out waiting for shutdown stage 3 to complete, the shutdown will continue"
|
||||
)
|
||||
|
||||
# Python 3.9+ and backported in runner.py
|
||||
await self.loop.shutdown_default_executor() # type: ignore
|
||||
|
||||
Reference in new issue
Block a user