From 4ab02cb9bc23ed5dfbbe54d4dd10c3fc5932825e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 8 Oct 2020 02:15:25 -0500
Subject: [PATCH] Ensure recorder commit can retry after encountering invalid
 data (#41426)

---
 homeassistant/components/recorder/__init__.py |  3 +-
 tests/components/recorder/test_init.py        | 40 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py
index 3736ecaaf29..3cfa2d68d53 100644
--- a/homeassistant/components/recorder/__init__.py
+++ b/homeassistant/components/recorder/__init__.py
@@ -506,7 +506,8 @@ class Recorder(threading.Thread):
                 for dbstate in self._pending_expunge:
                     # Expunge the state so its not expired
                     # until we use it later for dbstate.old_state
-                    self.event_session.expunge(dbstate)
+                    if dbstate in self.event_session:
+                        self.event_session.expunge(dbstate)
                 self._pending_expunge = []
             self.event_session.commit()
         except Exception as err:
diff --git a/tests/components/recorder/test_init.py b/tests/components/recorder/test_init.py
index fb860348a46..fcda7b0bb67 100644
--- a/tests/components/recorder/test_init.py
+++ b/tests/components/recorder/test_init.py
@@ -2,6 +2,8 @@
 # pylint: disable=protected-access
 from datetime import datetime, timedelta
 
+from sqlalchemy.exc import OperationalError
+
 from homeassistant.components.recorder import (
     CONFIG_SCHEMA,
     DOMAIN,
@@ -45,6 +47,44 @@ def test_saving_state(hass, hass_recorder):
     assert state == _state_empty_context(hass, entity_id)
 
 
+def test_saving_state_with_exception(hass, hass_recorder, caplog):
+    """Test saving and restoring a state."""
+    hass = hass_recorder()
+
+    entity_id = "test.recorder"
+    state = "restoring_from_db"
+    attributes = {"test_attr": 5, "test_attr_10": "nice"}
+
+    def _throw_if_state_in_session(*args, **kwargs):
+        for obj in hass.data[DATA_INSTANCE].event_session:
+            if isinstance(obj, States):
+                raise OperationalError(
+                    "insert the state", "fake params", "forced to fail"
+                )
+
+    with patch("time.sleep"), patch.object(
+        hass.data[DATA_INSTANCE].event_session,
+        "flush",
+        side_effect=_throw_if_state_in_session,
+    ):
+        hass.states.set(entity_id, "fail", attributes)
+        wait_recording_done(hass)
+
+    assert "Error executing query" in caplog.text
+    assert "Error saving events" not in caplog.text
+
+    caplog.clear()
+    hass.states.set(entity_id, state, attributes)
+    wait_recording_done(hass)
+
+    with session_scope(hass=hass) as session:
+        db_states = list(session.query(States))
+        assert len(db_states) >= 1
+
+    assert "Error executing query" not in caplog.text
+    assert "Error saving events" not in caplog.text
+
+
 def test_saving_event(hass, hass_recorder):
     """Test saving and restoring an event."""
     hass = hass_recorder()