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

Make sure to close file stream after backup upload (#5723)

Browse Source 
* Make sure to close file stream after backup upload

Currently the file stream does not get closed before importing the file
stream. It seems the test case didn't catch that, presumably because
it is a race condition if the bytes get flushed to disk or not.

Properly close the stream before continue handling the file.

* Close file stream in executor

* Add comment about closing twice is fine
This commit is contained in:
Stefan Agner 2025-03-04 16:11:25 +01:00 committed by GitHub
parent 582b128ad9
commit 76e916a07e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
supervisor/api/backups.py
View File

@ -531,6 +531,8 @@ class APIBackups(CoreSysAttributes):
def close_backup_file() -> None:
if backup_file_stream:
# Make sure it got closed, in case of exception. It is safe to
# close the file stream twice.
backup_file_stream.close()
if temp_dir:
temp_dir.cleanup()
@ -541,6 +543,7 @@ class APIBackups(CoreSysAttributes):
tar_file = await self.sys_run_in_executor(open_backup_file)
while chunk := await contents.read_chunk(size=2**16):
await self.sys_run_in_executor(backup_file_stream.write, chunk)
await self.sys_run_in_executor(backup_file_stream.close)
backup = await asyncio.shield(
self.sys_backups.import_backup(
@ -563,8 +566,7 @@ class APIBackups(CoreSysAttributes):
return False
finally:
if temp_dir or backup:
await self.sys_run_in_executor(close_backup_file)
await self.sys_run_in_executor(close_backup_file)
if backup:
return {ATTR_SLUG: backup.slug}