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

Avoid lingering tasks when using background backup tasks (#5518)

Browse Source 
When a backup tasks is run in background, but actually has an error
early the secondary event task to release the callee is lingering around
still, ultimately leading to a "Task was destroyed but it is pending!"
asyncio error.

Make sure we cancel the event task in case the backup returns early.
This commit is contained in:
Stefan Agner 2024-12-31 13:16:18 +01:00 committed by GitHub
parent e72c5a037b
commit 61b37877be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
supervisor/api/backups.py
View File

@ -296,13 +296,18 @@ class APIBackups(CoreSysAttributes):
BusEvent.SUPERVISOR_STATE_CHANGE, release_on_freeze BusEvent.SUPERVISOR_STATE_CHANGE, release_on_freeze
) )
try: try:
await asyncio.wait( event_task = self.sys_create_task(event.wait())
_, pending = await asyncio.wait(
( (
backup_task, backup_task,
self.sys_create_task(event.wait()), event_task,
), ),
return_when=asyncio.FIRST_COMPLETED, return_when=asyncio.FIRST_COMPLETED,
) )
# It seems backup returned early (error or something), make sure to cancel
# the event task to avoid "Task was destroyed but it is pending!" errors.
if event_task in pending:
event_task.cancel()
return (backup_task, job.uuid) return (backup_task, job.uuid)
finally: finally:
self.sys_bus.remove_listener(listener) self.sys_bus.remove_listener(listener)