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

Fix logic for purge of recorder runs (#130378)

Browse Source 
* Fix logic for purge of recorder runs

* Make test more explicit

* Explicitly don't remove unclosed recorder runs in purge
This commit is contained in:
Erik Montnemery 2024-11-26 07:47:47 +01:00 committed by GitHub
parent ec8fe3db4e
commit 44f90dca0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
homeassistant/components/recorder/queries.py
View File

@ -608,7 +608,8 @@ def delete_recorder_runs_rows(
"""Delete recorder_runs rows.""" """Delete recorder_runs rows."""
return lambda_stmt( return lambda_stmt(
lambda: delete(RecorderRuns) lambda: delete(RecorderRuns)
.filter(RecorderRuns.start < purge_before) .filter(RecorderRuns.end.is_not(None))
.filter(RecorderRuns.end < purge_before)
.filter(RecorderRuns.run_id != current_run_id) .filter(RecorderRuns.run_id != current_run_id)
.execution_options(synchronize_session=False) .execution_options(synchronize_session=False)
) )

6
tests/components/recorder/test_purge.py
View File

@ -352,6 +352,8 @@ async def test_purge_old_recorder_runs(
with session_scope(hass=hass) as session: with session_scope(hass=hass) as session:
recorder_runs = session.query(RecorderRuns) recorder_runs = session.query(RecorderRuns)
assert recorder_runs.count() == 7 assert recorder_runs.count() == 7
# Make sure we have a run that is not closed
assert sum(run.end is None for run in recorder_runs) == 1
purge_before = dt_util.utcnow() purge_before = dt_util.utcnow()
@ -376,7 +378,9 @@ async def test_purge_old_recorder_runs(
with session_scope(hass=hass) as session: with session_scope(hass=hass) as session:
recorder_runs = session.query(RecorderRuns) recorder_runs = session.query(RecorderRuns)
assert recorder_runs.count() == 1 assert recorder_runs.count() == 3
# Make sure we did not purge the unclosed run
assert sum(run.end is None for run in recorder_runs) == 1
async def test_purge_old_statistics_runs( async def test_purge_old_statistics_runs(

2
tests/components/recorder/test_purge_v32_schema.py
View File

@ -347,7 +347,7 @@ async def test_purge_old_recorder_runs(
with session_scope(hass=hass) as session: with session_scope(hass=hass) as session:
recorder_runs = session.query(RecorderRuns) recorder_runs = session.query(RecorderRuns)
assert recorder_runs.count() == 1 assert recorder_runs.count() == 3
async def test_purge_old_statistics_runs( async def test_purge_old_statistics_runs(