evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix deadlock when restarting scripts (#49410)

Browse source
This commit is contained in:
Erik Montnemery 2021-04-19 14:45:01 +02:00 • committed by GitHub
parent 83ecabe0a2
commit a968dea152
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
homeassistant/helpers/script.py
View file

@ -1212,13 +1212,8 @@ class Script:
raise
async def _async_stop(
self, update_state: bool, spare: _ScriptRun | None = None
self, aws: list[asyncio.Task], update_state: bool, spare: _ScriptRun | None
) -> None:
aws = [
asyncio.create_task(run.async_stop()) for run in self._runs if run != spare
]
if not aws:
return
await asyncio.wait(aws)
if update_state:
self._changed()
@ -1227,7 +1222,15 @@ class Script:
self, update_state: bool = True, spare: _ScriptRun | None = None
) -> None:
"""Stop running script."""
await asyncio.shield(self._async_stop(update_state, spare))
# Collect a a list of script runs to stop. This must be done before calling
# asyncio.shield as asyncio.shield yields to the event loop, which would cause
# us to wait for script runs added after the call to async_stop.
aws = [
asyncio.create_task(run.async_stop()) for run in self._runs if run != spare
]
if not aws:
return
await asyncio.shield(self._async_stop(aws, update_state, spare))
async def _async_get_condition(self, config):
if isinstance(config, template.Template):