diff options
| author | Sean Quah <8349537+squahtx@users.noreply.github.com> | 2022-03-14 17:52:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 17:52:58 +0000 |
| commit | 8e5706d14448c0fe8d1c55eaca38a672c701d7a9 (patch) | |
| tree | 3924f0a5c5ce6656672d43b39b84e0afffc3ae74 | |
| parent | Add `delay_cancellation` utility function (#12180) (diff) | |
| download | synapse-8e5706d14448c0fe8d1c55eaca38a672c701d7a9.tar.xz | |
Fix broken background updates when using sqlite with `enable_search` off (#12215)
Signed-off-by: Sean Quah <seanq@element.io>
| -rw-r--r-- | changelog.d/12215.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/databases/main/search.py | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/changelog.d/12215.bugfix b/changelog.d/12215.bugfix new file mode 100644 index 0000000000..593b12556b --- /dev/null +++ b/changelog.d/12215.bugfix @@ -0,0 +1 @@ +Fix a bug introduced in 1.54.0 that broke background updates on sqlite homeservers while search was disabled. diff --git a/synapse/storage/databases/main/search.py b/synapse/storage/databases/main/search.py index e23b119072..c5e9010c83 100644 --- a/synapse/storage/databases/main/search.py +++ b/synapse/storage/databases/main/search.py @@ -125,9 +125,6 @@ class SearchBackgroundUpdateStore(SearchWorkerStore): ): super().__init__(database, db_conn, hs) - if not hs.config.server.enable_search: - return - self.db_pool.updates.register_background_update_handler( self.EVENT_SEARCH_UPDATE_NAME, self._background_reindex_search ) @@ -243,9 +240,13 @@ class SearchBackgroundUpdateStore(SearchWorkerStore): return len(event_search_rows) - result = await self.db_pool.runInteraction( - self.EVENT_SEARCH_UPDATE_NAME, reindex_search_txn - ) + if self.hs.config.server.enable_search: + result = await self.db_pool.runInteraction( + self.EVENT_SEARCH_UPDATE_NAME, reindex_search_txn + ) + else: + # Don't index anything if search is not enabled. + result = 0 if not result: await self.db_pool.updates._end_background_update( |