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

Fix bug that could cause a /sync to tightloop with sqlite after restart #16540

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Fix bug that could cause a /sync to tightloop with sqlite after restart #16540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a95735e
Fix bug that could cause a /sync to tightloop with sqlite after restart
erikjohnston Oct 23, 2023
5753c9d
Newsfile
erikjohnston Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/16540.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix long-standing bug where `/sync` could tightloop after restart when using SQLite.
5 changes: 4 additions & 1 deletion synapse/storage/databases/main/account_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ def __init__(
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"),
],
Comment on lines +97 to +100
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this include room_account_data too, like the postgres ID generator?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's included above. (These are extra_tables= rather than tables= that MultiWriterIdGenerator uses)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(This feels like something a lint could check 😢 )

is_writer=self._instance_name in hs.config.worker.writers.account_data,
)

Expand Down
Loading