Skip to content

Remove automatic sqlite vacuum #12728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 1 commit into from
Feb 27, 2018
Merged

Remove automatic sqlite vacuum #12728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions homeassistant/components/recorder/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ def __init__(self, hass: HomeAssistant, keep_days: int,
self.hass = hass
self.keep_days = keep_days
self.purge_interval = purge_interval
self.did_vacuum = False
self.queue = queue.Queue() # type: Any
self.recording_start = dt_util.utcnow()
self.db_url = uri
Expand Down Expand Up @@ -269,7 +268,7 @@ def notify_hass_started(event):
def async_purge(now):
"""Trigger the purge and schedule the next run."""
self.queue.put(
PurgeTask(self.keep_days, repack=not self.did_vacuum))
PurgeTask(self.keep_days, repack=False))
self.hass.helpers.event.async_track_point_in_time(
async_purge, now + timedelta(days=self.purge_interval))

Expand Down
1 change: 0 additions & 1 deletion homeassistant/components/recorder/purge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,5 @@ def purge_old_data(instance, purge_days, repack):
_LOGGER.debug("Vacuuming SQLite to free space")
try:
instance.engine.execute("VACUUM")
instance.did_vacuum = True
except exc.OperationalError as err:
_LOGGER.error("Error vacuuming SQLite: %s.", err)
17 changes: 10 additions & 7 deletions tests/components/recorder/test_purge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import json
from datetime import datetime, timedelta
import unittest
from unittest.mock import patch

from homeassistant.components import recorder
from homeassistant.components.recorder.const import DATA_INSTANCE
Expand Down Expand Up @@ -199,10 +200,12 @@ def test_purge_method(self):
event.event_type for event in events.all()))

# run purge method - correct service data, with repack
service_data['repack'] = True
self.assertFalse(self.hass.data[DATA_INSTANCE].did_vacuum)
self.hass.services.call('recorder', 'purge',
service_data=service_data)
self.hass.block_till_done()
self.hass.data[DATA_INSTANCE].block_till_done()
self.assertTrue(self.hass.data[DATA_INSTANCE].did_vacuum)
with patch('homeassistant.components.recorder.purge._LOGGER') \
as mock_logger:
service_data['repack'] = True
self.hass.services.call('recorder', 'purge',
service_data=service_data)
self.hass.block_till_done()
self.hass.data[DATA_INSTANCE].block_till_done()
self.assertEqual(mock_logger.debug.mock_calls[4][1][0],
"Vacuuming SQLite to free space")