Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 8e5706d

Browse files
authored
Fix broken background updates when using sqlite with enable_search off (#12215)
Signed-off-by: Sean Quah <[email protected]>
1 parent 90b2327 commit 8e5706d

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

changelog.d/12215.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a bug introduced in 1.54.0 that broke background updates on sqlite homeservers while search was disabled.

synapse/storage/databases/main/search.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ def __init__(
125125
):
126126
super().__init__(database, db_conn, hs)
127127

128-
if not hs.config.server.enable_search:
129-
return
130-
131128
self.db_pool.updates.register_background_update_handler(
132129
self.EVENT_SEARCH_UPDATE_NAME, self._background_reindex_search
133130
)
@@ -243,9 +240,13 @@ def reindex_search_txn(txn):
243240

244241
return len(event_search_rows)
245242

246-
result = await self.db_pool.runInteraction(
247-
self.EVENT_SEARCH_UPDATE_NAME, reindex_search_txn
248-
)
243+
if self.hs.config.server.enable_search:
244+
result = await self.db_pool.runInteraction(
245+
self.EVENT_SEARCH_UPDATE_NAME, reindex_search_txn
246+
)
247+
else:
248+
# Don't index anything if search is not enabled.
249+
result = 0
249250

250251
if not result:
251252
await self.db_pool.updates._end_background_update(

0 commit comments

Comments
 (0)