Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit ffbe9b7

Browse files
authored
Remove duplicate call to wake a remote destination when using federation sending worker (#16515)
1 parent 3df70aa commit ffbe9b7

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

changelog.d/16515.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove duplicate call to mark remote server 'awake' when using a federation sending worker.

synapse/replication/tcp/client.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -279,14 +279,6 @@ async def on_position(
279279
# may be streaming.
280280
self.notifier.notify_replication()
281281

282-
def on_remote_server_up(self, server: str) -> None:
283-
"""Called when get a new REMOTE_SERVER_UP command."""
284-
285-
# Let's wake up the transaction queue for the server in case we have
286-
# pending stuff to send to it.
287-
if self.send_handler:
288-
self.send_handler.wake_destination(server)
289-
290282
async def wait_for_stream_position(
291283
self,
292284
instance_name: str,
@@ -405,9 +397,6 @@ def __init__(self, hs: "HomeServer"):
405397

406398
self._fed_position_linearizer = Linearizer(name="_fed_position_linearizer")
407399

408-
def wake_destination(self, server: str) -> None:
409-
self.federation_sender.wake_destination(server)
410-
411400
async def process_replication_rows(
412401
self, stream_name: str, token: int, rows: list
413402
) -> None:

synapse/replication/tcp/handler.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,8 +657,6 @@ def on_REMOTE_SERVER_UP(
657657
self, conn: IReplicationConnection, cmd: RemoteServerUpCommand
658658
) -> None:
659659
"""Called when get a new REMOTE_SERVER_UP command."""
660-
self._replication_data_handler.on_remote_server_up(cmd.data)
661-
662660
self._notifier.notify_remote_server_up(cmd.data)
663661

664662
def on_LOCK_RELEASED(

0 commit comments

Comments
 (0)