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

Fix bug when running presence off master #10149

Merged
merged 4 commits into from
Jun 11, 2021
Merged

Fix bug when running presence off master #10149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b073ad6
Fix bug when running presence off master
erikjohnston Jun 9, 2021
77ad77b
Newsfile
erikjohnston Jun 9, 2021
458aef8
Use exceptions
erikjohnston Jun 10, 2021
13d7200
Apply suggestions from code review
erikjohnston Jun 11, 2021
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/10149.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug which caused presence updates to stop working some time after restart, when using a presence writer worker.
2 changes: 1 addition & 1 deletion synapse/storage/databases/main/presence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def __init__(
instance_name=self._instance_name,
tables=[("presence_stream", "instance_name", "stream_id")],
sequence_name="presence_stream_sequence",
writers=hs.config.worker.writers.to_device,
writers=hs.config.worker.writers.presence,
Copy link
Member

Choose a reason for hiding this comment

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

hawkward!

Copy link
Member Author

Choose a reason for hiding this comment

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

inorite

)
else:
self._presence_id_gen = StreamIdGenerator(
Expand Down
15 changes: 15 additions & 0 deletions synapse/storage/util/id_generators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,11 @@ def get_next(self):
# ... persist event ...
"""

# If we have a list of instances that are allowed to write to this
# stream, make sure we're in it.
if self._writers and self._instance_name not in self._writers:
raise Exception("Tried to allocate stream ID on non-writer")

return _MultiWriterCtxManager(self)

def get_next_mult(self, n: int):
Expand All @@ -406,6 +411,11 @@ def get_next_mult(self, n: int):
# ... persist events ...
"""

# If we have a list of instances that are allowed to write to this
# stream, make sure we're in it.
if self._writers and self._instance_name not in self._writers:
raise Exception("Tried to allocate stream ID on non-writer")

return _MultiWriterCtxManager(self, n)

def get_next_txn(self, txn: LoggingTransaction):
Expand All @@ -416,6 +426,11 @@ def get_next_txn(self, txn: LoggingTransaction):
# ... persist event ...
"""

# If we have a list of instances that are allowed to write to this
# stream, make sure we're in it.
if self._writers and self._instance_name not in self._writers:
raise Exception("Tried to allocate stream ID on non-writer")

next_id = self._load_next_id_txn(txn)

with self._lock:
Expand Down