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

Correctly read to-device stream pos on SQLite #16682

Merged
merged 3 commits into from
Nov 24, 2023
Merged

Correctly read to-device stream pos on SQLite #16682

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a65456
Correctly read to-device stream pos on SQLite
Nov 23, 2023
b793359
Changelog
Nov 23, 2023
530337d
device_inbox_id_gen -> to_device_msg_id_gen
Nov 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
11 changes: 9 additions & 2 deletions synapse/storage/databases/main/deviceinbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,22 @@ def __init__(
notifier=hs.get_replication_notifier(),
stream_name="to_device",
instance_name=self._instance_name,
tables=[("device_inbox", "instance_name", "stream_id")],
tables=[
("device_inbox", "instance_name", "stream_id"),
("device_federation_outbox", "instance_name", "stream_id"),
],
Copy link
Member

Choose a reason for hiding this comment

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

Why don't we see a problem on postgres then?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because postgres uses a sequence in the DB to generate the IDs. This list of tables is only for enforcing consistency with that sequence at startup time.

Copy link
Member

Choose a reason for hiding this comment

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

Oh yeah!

sequence_name="device_inbox_sequence",
writers=hs.config.worker.writers.to_device,
)
)
else:
self._can_write_to_device = True
self._device_inbox_id_gen = StreamIdGenerator(
db_conn, hs.get_replication_notifier(), "device_inbox", "stream_id"
db_conn,
hs.get_replication_notifier(),
"device_inbox",
"stream_id",
extra_tables=[("device_federation_outbox", "stream_id")],
)

max_device_inbox_id = self._device_inbox_id_gen.get_current_token()
Expand Down
Loading