From ffbe9b76665fb5dd9513045357247da39339e0b8 Mon Sep 17 00:00:00 2001
From: Jason Little <realtyem@gmail.com>
Date: Tue, 24 Oct 2023 07:09:59 -0500
Subject: Remove duplicate call to wake a remote destination when using
 federation sending worker (#16515)

---
 changelog.d/16515.misc             |  1 +
 synapse/replication/tcp/client.py  | 11 -----------
 synapse/replication/tcp/handler.py |  2 --
 3 files changed, 1 insertion(+), 13 deletions(-)
 create mode 100644 changelog.d/16515.misc

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(
-- 
cgit 1.4.1