diff options
| author | Erik Johnston <erikj@element.io> | 2024-07-02 12:39:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-02 12:39:49 +0100 |
| commit | b3b793786c82383edec6c7d3226d98dbafe3b098 (patch) | |
| tree | 42799dd94510980636618488995ed133bcf4d73c /tests/rest | |
| parent | Fix building debian packages on non-clean checkouts (#17390) (diff) | |
| download | synapse-b3b793786c82383edec6c7d3226d98dbafe3b098.tar.xz | |
Fix sync waiting for an invalid token from the "future" (#17386)
Fixes https://github.com/element-hq/synapse/issues/17274, hopefully. Basically, old versions of Synapse could advance streams without persisting anything in the DB (fixed in #17229). On restart those updates would get lost, and so the position of the stream would revert to an older position. If this happened across an upgrade to a later Synapse version which included #17215, then sync could get blocked indefinitely (until the stream advanced to the position in the token). We fix this by bounding the stream positions we'll wait for to the maximum position of the underlying stream ID generator.
Diffstat (limited to 'tests/rest')
| -rw-r--r-- | tests/rest/client/test_sync.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/rest/client/test_sync.py b/tests/rest/client/test_sync.py index bfb26139d3..12c11f342c 100644 --- a/tests/rest/client/test_sync.py +++ b/tests/rest/client/test_sync.py @@ -1386,10 +1386,12 @@ class SlidingSyncTestCase(unittest.HomeserverTestCase): # Create a future token that will cause us to wait. Since we never send a new # event to reach that future stream_ordering, the worker will wait until the # full timeout. + stream_id_gen = self.store.get_events_stream_id_generator() + stream_id = self.get_success(stream_id_gen.get_next().__aenter__()) current_token = self.event_sources.get_current_token() future_position_token = current_token.copy_and_replace( StreamKeyType.ROOM, - RoomStreamToken(stream=current_token.room_key.stream + 1), + RoomStreamToken(stream=stream_id), ) future_position_token_serialized = self.get_success( |