diff options
| author | Erik Johnston <erik@matrix.org> | 2020-05-01 15:21:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 15:21:35 +0100 |
| commit | 3085cde577216519d789c8160262831cb2029972 (patch) | |
| tree | bbd1fc5b416eb091dd7b936247d87079505239d1 /synapse/replication/tcp/handler.py | |
| parent | async/await is_server_admin (#7363) (diff) | |
| download | synapse-3085cde577216519d789c8160262831cb2029972.tar.xz | |
Use `stream.current_token()` and remove `stream_positions()` (#7172)
We move the processing of typing and federation replication traffic into their handlers so that `Stream.current_token()` points to a valid token. This allows us to remove `get_streams_to_replicate()` and `stream_positions()`.
Diffstat (limited to 'synapse/replication/tcp/handler.py')
| -rw-r--r-- | synapse/replication/tcp/handler.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/synapse/replication/tcp/handler.py b/synapse/replication/tcp/handler.py index 6f7054d5af..d72f3d0cf9 100644 --- a/synapse/replication/tcp/handler.py +++ b/synapse/replication/tcp/handler.py @@ -314,15 +314,7 @@ class ReplicationCommandHandler: self._pending_batches.pop(cmd.stream_name, []) # Find where we previously streamed up to. - current_token = self._replication_data_handler.get_streams_to_replicate().get( - cmd.stream_name - ) - if current_token is None: - logger.warning( - "Got POSITION for stream we're not subscribed to: %s", - cmd.stream_name, - ) - return + current_token = stream.current_token() # If the position token matches our current token then we're up to # date and there's nothing to do. Otherwise, fetch all updates |