diff options
| author | Erik Johnston <erikj@matrix.org> | 2023-10-23 14:39:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-23 13:39:25 +0000 |
| commit | 3bc23cc45cb6a70d53ba4032a9116029bc4f538c (patch) | |
| tree | ad097de2bca816d15921013fb7490390acf34ffe | |
| parent | Mention how to redirect the Jaeger traces to a specific Jaeger instance (#16531) (diff) | |
| download | synapse-3bc23cc45cb6a70d53ba4032a9116029bc4f538c.tar.xz | |
Fix bug that could cause a `/sync` to tightloop with sqlite after restart (#16540)
This could happen if the last rows in the account data stream were inserted into `account_data`. After a restart the max account ID would be calculated without looking at the `account_data` table, and so have an old ID.
| -rw-r--r-- | changelog.d/16540.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/databases/main/account_data.py | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelog.d/16540.bugfix b/changelog.d/16540.bugfix new file mode 100644 index 0000000000..34ee9facf9 --- /dev/null +++ b/changelog.d/16540.bugfix @@ -0,0 +1 @@ +Fix long-standing bug where `/sync` could tightloop after restart when using SQLite. diff --git a/synapse/storage/databases/main/account_data.py b/synapse/storage/databases/main/account_data.py index 39498d52c6..84ef8136c2 100644 --- a/synapse/storage/databases/main/account_data.py +++ b/synapse/storage/databases/main/account_data.py @@ -94,7 +94,10 @@ class AccountDataWorkerStore(PushRulesWorkerStore, CacheInvalidationWorkerStore) hs.get_replication_notifier(), "room_account_data", "stream_id", - extra_tables=[("room_tags_revisions", "stream_id")], + extra_tables=[ + ("account_data", "stream_id"), + ("room_tags_revisions", "stream_id"), + ], is_writer=self._instance_name in hs.config.worker.writers.account_data, ) |