Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate call to wake a remote destination when using federation sending worker (#16515)

This commit is contained in:
Jason Little 2023-10-24 07:09:59 -05:00 committed by GitHub
parent 3df70aa800
commit ffbe9b7666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/16515.misc Normal file
View File

@ -0,0 +1 @@
Remove duplicate call to mark remote server 'awake' when using a federation sending worker.

11
synapse/replication/tcp/client.py
View File

@ -279,14 +279,6 @@ class ReplicationDataHandler:
# may be streaming. # may be streaming.
self.notifier.notify_replication() 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( async def wait_for_stream_position(
self, self,
instance_name: str, instance_name: str,
@ -405,9 +397,6 @@ class FederationSenderHandler:
self._fed_position_linearizer = Linearizer(name="_fed_position_linearizer") 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( async def process_replication_rows(
self, stream_name: str, token: int, rows: list self, stream_name: str, token: int, rows: list
) -> None: ) -> None:

2
synapse/replication/tcp/handler.py
View File

@ -657,8 +657,6 @@ class ReplicationCommandHandler:
self, conn: IReplicationConnection, cmd: RemoteServerUpCommand self, conn: IReplicationConnection, cmd: RemoteServerUpCommand
) -> None: ) -> None:
"""Called when get a new REMOTE_SERVER_UP command.""" """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) self._notifier.notify_remote_server_up(cmd.data)
def on_LOCK_RELEASED( def on_LOCK_RELEASED(