Skip to content

db max retries and db retry wait added as vars to Recorder #31559

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

Closed
TechnicallyJoe wants to merge 4 commits into from
Closed

db max retries and db retry wait added as vars to Recorder #31559

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d14ccc
Added db_max_retries & db_retry_wait to recorder component
Feb 6, 2020
fcc77a7
updated config_schema to load new variables from configuration.yaml
Feb 6, 2020
e98a8e0
amended author
Feb 6, 2020
2814a2d
Merge branch 'dev' of https://github.com/Technicallyjoe/home-assistan…
Feb 6, 2020
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
34 changes: 26 additions & 8 deletions homeassistant/components/recorder/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,16 @@

DEFAULT_URL = "sqlite:///{hass_config_path}"
DEFAULT_DB_FILE = "home-assistant_v2.db"
DEFAULT_DB_MAX_RETRIES = 10
DEFAULT_DB_RETRY_WAIT = 3

CONF_DB_URL = "db_url"
CONF_DB_MAX_RETRIES = "db_max_retries"
CONF_DB_RETRY_WAIT = "db_retry_wait"
CONF_PURGE_KEEP_DAYS = "purge_keep_days"
CONF_PURGE_INTERVAL = "purge_interval"
CONF_EVENT_TYPES = "event_types"

CONNECT_RETRY_WAIT = 3

FILTER_SCHEMA = vol.Schema(
{
vol.Optional(CONF_EXCLUDE, default={}): vol.Schema(
Expand Down Expand Up @@ -96,6 +98,8 @@
vol.Coerce(int), vol.Range(min=0)
),
vol.Optional(CONF_DB_URL): cv.string,
vol.Optional(CONF_DB_MAX_RETRIES): cv.positive_int,
vol.Optional(CONF_DB_RETRY_WAIT): cv.positive_int,
}
)
},
Expand Down Expand Up @@ -138,13 +142,23 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
if not db_url:
db_url = DEFAULT_URL.format(hass_config_path=hass.config.path(DEFAULT_DB_FILE))

db_max_retries = conf.get(CONF_DB_MAX_RETRIES, None)
if not db_max_retries:
db_max_retries = DEFAULT_DB_MAX_RETRIES

db_retry_wait = conf.get(CONF_DB_RETRY_WAIT, None)
if not db_retry_wait:
db_retry_wait = DEFAULT_DB_RETRY_WAIT

include = conf.get(CONF_INCLUDE, {})
exclude = conf.get(CONF_EXCLUDE, {})
instance = hass.data[DATA_INSTANCE] = Recorder(
hass=hass,
keep_days=keep_days,
purge_interval=purge_interval,
uri=db_url,
db_max_retries=db_max_retries,
db_retry_wait=db_retry_wait,
include=include,
exclude=exclude,
)
Expand Down Expand Up @@ -174,6 +188,8 @@ def __init__(
keep_days: int,
purge_interval: int,
uri: str,
db_max_retries: int,
db_retry_wait: int,
include: Dict,
exclude: Dict,
) -> None:
Expand All @@ -186,6 +202,8 @@ def __init__(
self.queue: Any = queue.Queue()
self.recording_start = dt_util.utcnow()
self.db_url = uri
self.db_max_retries = db_max_retries
self.db_retry_wait = db_retry_wait
self.async_db_ready = asyncio.Future()
self.engine: Any = None
self.run_info: Any = None
Expand Down Expand Up @@ -217,9 +235,9 @@ def run(self):
tries = 1
connected = False

while not connected and tries <= 10:
while not connected and tries <= self.db_max_retries:
if tries != 1:
time.sleep(CONNECT_RETRY_WAIT)
time.sleep(self.db_retry_wait)
try:
self._setup_connection()
migration.migrate_schema(self)
Expand All @@ -230,7 +248,7 @@ def run(self):
_LOGGER.error(
"Error during connection setup: %s (retrying in %s seconds)",
err,
CONNECT_RETRY_WAIT,
self.db_retry_wait,
)
tries += 1

Expand Down Expand Up @@ -337,9 +355,9 @@ def async_purge(now):

tries = 1
updated = False
while not updated and tries <= 10:
while not updated and tries <= self.db_max_retries:
if tries != 1:
time.sleep(CONNECT_RETRY_WAIT)
time.sleep(self.db_retry_wait)
try:
with session_scope(session=self.get_session()) as session:
try:
Expand Down Expand Up @@ -367,7 +385,7 @@ def async_purge(now):
"Error in database connectivity: %s. "
"(retrying in %s seconds)",
err,
CONNECT_RETRY_WAIT,
self.db_retry_wait,
)
tries += 1

Expand Down