diff options
| author | Jason Little <realtyem@gmail.com> | 2023-10-24 07:09:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-24 08:09:59 -0400 |
| commit | ffbe9b76665fb5dd9513045357247da39339e0b8 (patch) | |
| tree | c8c3387b3590fd09fa86183b1f4b7b10ccdf2a42 | |
| parent | Replace all Prometheus datasource UIDs of the Grafana Dashboard with the vari... (diff) | |
| download | synapse-ffbe9b76665fb5dd9513045357247da39339e0b8.tar.xz | |
Remove duplicate call to wake a remote destination when using federation sending worker (#16515)
Diffstat (limited to '')
| -rw-r--r-- | changelog.d/16515.misc | 1 | ||||
| -rw-r--r-- | synapse/replication/tcp/client.py | 11 | ||||
| -rw-r--r-- | synapse/replication/tcp/handler.py | 2 |
3 files changed, 1 insertions, 13 deletions
diff --git a/changelog.d/16515.misc b/changelog.d/16515.misc new file mode 100644 index 0000000000..d54dd730e1 --- /dev/null +++ b/changelog.d/16515.misc @@ -0,0 +1 @@ +Remove duplicate call to mark remote server 'awake' when using a federation sending worker. diff --git a/synapse/replication/tcp/client.py b/synapse/replication/tcp/client.py index d5337fe588..384355698d 100644 --- a/synapse/replication/tcp/client.py +++ b/synapse/replication/tcp/client.py @@ -279,14 +279,6 @@ class ReplicationDataHandler: # may be streaming. self.notifier.notify_replication() - def on_remote_server_up(self, server: str) -> None: - """Called when get a new REMOTE_SERVER_UP command.""" - - # Let's wake up the transaction queue for the server in case we have - # pending stuff to send to it. - if self.send_handler: - self.send_handler.wake_destination(server) - async def wait_for_stream_position( self, instance_name: str, @@ -405,9 +397,6 @@ class FederationSenderHandler: self._fed_position_linearizer = Linearizer(name="_fed_position_linearizer") - def wake_destination(self, server: str) -> None: - self.federation_sender.wake_destination(server) - async def process_replication_rows( self, stream_name: str, token: int, rows: list ) -> None: diff --git a/synapse/replication/tcp/handler.py b/synapse/replication/tcp/handler.py index b668bb5da1..1d586fb180 100644 --- a/synapse/replication/tcp/handler.py +++ b/synapse/replication/tcp/handler.py @@ -657,8 +657,6 @@ class ReplicationCommandHandler: self, conn: IReplicationConnection, cmd: RemoteServerUpCommand ) -> None: """Called when get a new REMOTE_SERVER_UP command.""" - self._replication_data_handler.on_remote_server_up(cmd.data) - self._notifier.notify_remote_server_up(cmd.data) def on_LOCK_RELEASED( |