From a7e2876784b86773cd913645f227430c5cb0838b Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Sun, 1 Sep 2024 10:44:03 +0100
Subject: [PATCH 1/2] Fix background update to handle invalid events

---
 synapse/storage/databases/main/events_bg_updates.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/synapse/storage/databases/main/events_bg_updates.py b/synapse/storage/databases/main/events_bg_updates.py
index e819364a164..ee38b3738b9 100644
--- a/synapse/storage/databases/main/events_bg_updates.py
+++ b/synapse/storage/databases/main/events_bg_updates.py
@@ -41,7 +41,10 @@
     SlidingSyncMembershipSnapshotSharedInsertValues,
     SlidingSyncStateInsertValues,
 )
-from synapse.storage.databases.main.events_worker import DatabaseCorruptionError
+from synapse.storage.databases.main.events_worker import (
+    DatabaseCorruptionError,
+    InvalidEventError,
+)
 from synapse.storage.databases.main.state_deltas import StateDeltasStore
 from synapse.storage.databases.main.stream import StreamWorkerStore
 from synapse.storage.types import Cursor
@@ -2090,7 +2093,7 @@ def _find_previous_membership_txn(
                         fetched_events = await self.get_events(
                             current_state_ids_map.values()
                         )
-                    except DatabaseCorruptionError as e:
+                    except (DatabaseCorruptionError, InvalidEventError) as e:
                         logger.warning(
                             "Failed to fetch state for room '%s' due to corrupted events. Ignoring. Error: %s",
                             room_id,
@@ -2197,7 +2200,7 @@ def _find_previous_membership_txn(
 
                 try:
                     fetched_events = await self.get_events(state_ids_map.values())
-                except DatabaseCorruptionError as e:
+                except (DatabaseCorruptionError, InvalidEventError) as e:
                     logger.warning(
                         "Failed to fetch state for room '%s' due to corrupted events. Ignoring. Error: %s",
                         room_id,

From e636c761cbe318b86de0d2104c773d1e730646c3 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Sun, 1 Sep 2024 10:45:27 +0100
Subject: [PATCH 2/2] Newsfile

---
 changelog.d/17641.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/17641.misc

diff --git a/changelog.d/17641.misc b/changelog.d/17641.misc
new file mode 100644
index 00000000000..756918e2b21
--- /dev/null
+++ b/changelog.d/17641.misc
@@ -0,0 +1 @@
+Pre-populate room data used in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint for quick filtering/sorting.