Start recorder data migration after schema migration (home-assistant#153471)

Author: emontnemery

homeassistant/components/recorder/core.py

@@ -806,6 +806,10 @@ def _run(self) -> None:
 
         # Catch up with missed statistics
         self._schedule_compile_missing_statistics()
+
+        # Kick off live migrations
+        migration.migrate_data_live(self, self.get_session, schema_status)
+
         _LOGGER.debug("Recorder processing the queue")
         self._adjust_lru_size()
         self.hass.add_job(self._async_set_recorder_ready_migration_done)
@@ -822,8 +826,6 @@ def _activate_and_set_db_ready(
             # there are a lot of statistics graphs on the frontend.
             self.statistics_meta_manager.load(session)
 
-        migration.migrate_data_live(self, self.get_session, schema_status)
-
         # We must only set the db ready after we have set the table managers
         # to active if there is no data to migrate.
         #

tests/components/recorder/test_v32_migration.py

@@ -845,11 +845,28 @@ def _add_data():
                     instrumented_migration.live_migration_done.wait
                 )
 
+                # The states.event_id foreign key constraint was removed when
+                # migration to schema version 46
+                assert (
+                    await instance.async_add_executor_job(_get_event_id_foreign_keys)
+                    is None
+                )
+
+                # Re-add the foreign key constraint to simulate failure to remove it during
+                # schema migration
+                with patch.object(migration, "Base", old_db_schema.Base):
+                    await instance.async_add_executor_job(
+                        migration._restore_foreign_key_constraints,
+                        instance.get_session,
+                        instance.engine,
+                        [("states", "event_id", "events", "event_id")],
+                    )
+
                 # Simulate out of disk space while removing the foreign key from the states table by
                 # - patching DropConstraint to raise InternalError for MySQL and PostgreSQL
                 with (
                     patch(
-                        "homeassistant.components.recorder.migration.sqlalchemy.inspect",
+                        "homeassistant.components.recorder.migration.DropConstraint.__init__",
                         side_effect=OperationalError(
                             None, None, OSError("No space left on device")
                         ),
@@ -867,14 +884,6 @@ def _add_data():
                     )
                     states_index_names = {index["name"] for index in states_indexes}
                     assert instance.use_legacy_events_index is True
-                    # The states.event_id foreign key constraint was removed when
-                    # migration to schema version 46
-                    assert (
-                        await instance.async_add_executor_job(
-                            _get_event_id_foreign_keys
-                        )
-                        is None
-                    )
 
                     await hass.async_stop()