From dce38f3faf169b5d93a1e9b8e00915b7ddc4fb7e Mon Sep 17 00:00:00 2001
From: Erik Johnston <erikj@element.io>
Date: Wed, 4 Sep 2024 10:52:46 +0100
Subject: [PATCH] Fix sliding sync on workers (#17649)
Broke in #17630
---------
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
---
changelog.d/17649.misc | 1 +
synapse/storage/databases/main/events_bg_updates.py | 11 -----------
synapse/storage/databases/main/roommember.py | 12 ++++++++++++
3 files changed, 13 insertions(+), 11 deletions(-)
create mode 100644 changelog.d/17649.misc
diff --git a/changelog.d/17649.misc b/changelog.d/17649.misc
new file mode 100644
index 0000000000..ed1bf6bd55
--- /dev/null
+++ b/changelog.d/17649.misc
@@ -0,0 +1 @@
+Use new database tables for sliding sync.
diff --git a/synapse/storage/databases/main/events_bg_updates.py b/synapse/storage/databases/main/events_bg_updates.py
index 4209100a5c..307440a614 100644
--- a/synapse/storage/databases/main/events_bg_updates.py
+++ b/synapse/storage/databases/main/events_bg_updates.py
@@ -2342,17 +2342,6 @@ class EventsBackgroundUpdatesStore(StreamWorkerStore, StateDeltasStore, SQLBaseS
return len(memberships_to_update_rows)
- async def have_finished_sliding_sync_background_jobs(self) -> bool:
- """Return if its safe to use the sliding sync membership tables."""
-
- return await self.db_pool.updates.have_completed_background_updates(
- (
- _BackgroundUpdates.SLIDING_SYNC_PREFILL_JOINED_ROOMS_TO_RECALCULATE_TABLE_BG_UPDATE,
- _BackgroundUpdates.SLIDING_SYNC_JOINED_ROOMS_BG_UPDATE,
- _BackgroundUpdates.SLIDING_SYNC_MEMBERSHIP_SNAPSHOTS_BG_UPDATE,
- )
- )
-
def _resolve_stale_data_in_sliding_sync_tables(
txn: LoggingTransaction,
diff --git a/synapse/storage/databases/main/roommember.py b/synapse/storage/databases/main/roommember.py
index 3d834b4bf1..8df760e8a6 100644
--- a/synapse/storage/databases/main/roommember.py
+++ b/synapse/storage/databases/main/roommember.py
@@ -51,6 +51,7 @@ from synapse.storage.database import (
LoggingTransaction,
)
from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore
+from synapse.storage.databases.main.events_bg_updates import _BackgroundUpdates
from synapse.storage.databases.main.events_worker import EventsWorkerStore
from synapse.storage.engines import Sqlite3Engine
from synapse.storage.roommember import (
@@ -1424,6 +1425,17 @@ class RoomMemberWorkerStore(EventsWorkerStore, CacheInvalidationWorkerStore):
get_sliding_sync_rooms_for_user_txn,
)
+ async def have_finished_sliding_sync_background_jobs(self) -> bool:
+ """Return if it's safe to use the sliding sync membership tables."""
+
+ return await self.db_pool.updates.have_completed_background_updates(
+ (
+ _BackgroundUpdates.SLIDING_SYNC_PREFILL_JOINED_ROOMS_TO_RECALCULATE_TABLE_BG_UPDATE,
+ _BackgroundUpdates.SLIDING_SYNC_JOINED_ROOMS_BG_UPDATE,
+ _BackgroundUpdates.SLIDING_SYNC_MEMBERSHIP_SNAPSHOTS_BG_UPDATE,
+ )
+ )
+
class RoomMemberBackgroundUpdateStore(SQLBaseStore):
def __init__(
--
GitLab