Skip to content
Snippets Groups Projects
Unverified Commit 3c8a116e authored by Kegan Dougal's avatar Kegan Dougal Committed by GitHub
Browse files

Sliding Sync: bugfix: ensure we can sync with SSS even with missing rooms (#17727)

Fixes https://github.com/element-hq/element-x-ios/issues/3300

Some rooms are missing from `sliding_sync_joined_rooms`. When this
happens, the first call will succeed, but any subsequent calls for this
room ID will cause the cache to return `None` for the room ID, rather
than not having the key at all. This then causes the `<=` check to
throw.

Root cause: https://github.com/element-hq/synapse/issues/17726

### Pull Request Checklist

<!-- Please read
https://element-hq.github.io/synapse/latest/development/contributing_guide.html
before submitting your pull request -->

* [x] Pull request is based on the develop branch
* [ ] Pull request includes a [changelog
file](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#changelog).
The entry should:
- Be a short description of your change which makes sense to users.
"Fixed a bug that prevented receiving messages from other servers."
instead of "Moved X method from `EventStore` to `EventWorkerStore`.".
  - Use markdown where necessary, mostly for `code blocks`.
  - End with either a period (.) or an exclamation mark (!).
  - Start with a capital letter.
- Feel free to credit yourself, by adding a sentence "Contributed by
@github_username." or "Contributed by [Your Name]." to the end of the
entry.
* [ ] [Code
style](https://element-hq.github.io/synapse/latest/code_style.html) is
correct
(run the
[linters](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#run-the-linters))
parent 51dd4df0
No related branches found
No related tags found
No related merge requests found
Fix a bug in SSS which could prevent /sync from working for certain user accounts.
...@@ -1469,6 +1469,10 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): ...@@ -1469,6 +1469,10 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
recheck_rooms: Set[str] = set() recheck_rooms: Set[str] = set()
min_token = end_token.stream min_token = end_token.stream
for room_id, stream in uncapped_results.items(): for room_id, stream in uncapped_results.items():
if stream is None:
# Despite the function not directly setting None, the cache can!
# See: https://github.com/element-hq/synapse/issues/17726
continue
if stream <= min_token: if stream <= min_token:
results[room_id] = stream results[room_id] = stream
else: else:
...@@ -1495,7 +1499,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): ...@@ -1495,7 +1499,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
@cachedList(cached_method_name="_get_max_event_pos", list_name="room_ids") @cachedList(cached_method_name="_get_max_event_pos", list_name="room_ids")
async def _bulk_get_max_event_pos( async def _bulk_get_max_event_pos(
self, room_ids: StrCollection self, room_ids: StrCollection
) -> Mapping[str, int]: ) -> Mapping[str, Optional[int]]:
"""Fetch the max position of a persisted event in the room.""" """Fetch the max position of a persisted event in the room."""
# We need to be careful not to return positions ahead of the current # We need to be careful not to return positions ahead of the current
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment