diff options
| author | Jonathan de Jong <jonathan@automatia.nl> | 2021-02-24 14:57:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-24 13:57:00 +0000 |
| commit | f5c93fc9931e4029bbd8000f398b6f39d67a8c46 (patch) | |
| tree | 537d1714534957ca65bdfc755ad4485656908166 /synapse/handlers/sync.py | |
| parent | Clean up `ShardedWorkerHandlingConfig` (#9466) (diff) | |
| download | synapse-f5c93fc9931e4029bbd8000f398b6f39d67a8c46.tar.xz | |
Fix #8518 (sync requests being cached wrongly on timeout) (#9358)
This fixes #8518 by adding a conditional check on `SyncResult` in a function when `prev_stream_token == current_stream_token`, as a sanity check. In `CachedResponse.set.<remove>()`, the result is immediately popped from the cache if the conditional function returns "false". This prevents the caching of a timed-out `SyncResult` (that has `next_key` as the stream key that produced that `SyncResult`). The cache is prevented from returning a `SyncResult` that makes the client request the same stream key over and over again, effectively making it stuck in a loop of requesting and getting a response immediately for as long as the cache keeps those values. Signed-off-by: Jonathan de Jong <jonathan@automatia.nl>
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 4e8ed7b33f..ce644e01ad 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -277,8 +277,9 @@ class SyncHandler: user_id = sync_config.user.to_string() await self.auth.check_auth_blocking(requester=requester) - res = await self.response_cache.wrap( + res = await self.response_cache.wrap_conditional( sync_config.request_key, + lambda result: since_token != result.next_batch, self._wait_for_sync_for_user, sync_config, since_token, |