mirror of
https://github.com/element-hq/synapse
synced 2024-09-04 18:20:07 +00:00
Move where we ack federation
This commit is contained in:
parent
36c28bc467
commit
6ce6bbedcb
1 changed files with 16 additions and 7 deletions
|
@ -153,15 +153,13 @@ class FederationSenderServer(HomeServer):
|
||||||
class FederationSenderReplicationHandler(ReplicationClientHandler):
|
class FederationSenderReplicationHandler(ReplicationClientHandler):
|
||||||
def __init__(self, hs):
|
def __init__(self, hs):
|
||||||
super(FederationSenderReplicationHandler, self).__init__(hs.get_datastore())
|
super(FederationSenderReplicationHandler, self).__init__(hs.get_datastore())
|
||||||
self.send_handler = FederationSenderHandler(hs)
|
self.send_handler = FederationSenderHandler(hs, self)
|
||||||
|
|
||||||
def on_rdata(self, stream_name, token, rows):
|
def on_rdata(self, stream_name, token, rows):
|
||||||
super(FederationSenderReplicationHandler, self).on_rdata(
|
super(FederationSenderReplicationHandler, self).on_rdata(
|
||||||
stream_name, token, rows
|
stream_name, token, rows
|
||||||
)
|
)
|
||||||
self.send_handler.process_replication_rows(stream_name, token, rows)
|
self.send_handler.process_replication_rows(stream_name, token, rows)
|
||||||
if stream_name == "federation":
|
|
||||||
self.send_federation_ack(token)
|
|
||||||
|
|
||||||
def get_streams_to_replicate(self):
|
def get_streams_to_replicate(self):
|
||||||
args = super(FederationSenderReplicationHandler, self).get_streams_to_replicate()
|
args = super(FederationSenderReplicationHandler, self).get_streams_to_replicate()
|
||||||
|
@ -248,13 +246,16 @@ class FederationSenderHandler(object):
|
||||||
"""Processes the replication stream and forwards the appropriate entries
|
"""Processes the replication stream and forwards the appropriate entries
|
||||||
to the federation sender.
|
to the federation sender.
|
||||||
"""
|
"""
|
||||||
def __init__(self, hs):
|
def __init__(self, hs, replication_client):
|
||||||
self.store = hs.get_datastore()
|
self.store = hs.get_datastore()
|
||||||
self.federation_sender = hs.get_federation_sender()
|
self.federation_sender = hs.get_federation_sender()
|
||||||
|
self.replication_client = replication_client
|
||||||
|
|
||||||
self.federation_position = self.store.federation_out_pos_startup
|
self.federation_position = self.store.federation_out_pos_startup
|
||||||
self._fed_position_linearizer = Linearizer(name="_fed_position_linearizer")
|
self._fed_position_linearizer = Linearizer(name="_fed_position_linearizer")
|
||||||
|
|
||||||
|
self._last_ack = self.federation_position
|
||||||
|
|
||||||
self._room_serials = {}
|
self._room_serials = {}
|
||||||
self._room_typing = {}
|
self._room_typing = {}
|
||||||
|
|
||||||
|
@ -345,10 +346,18 @@ class FederationSenderHandler(object):
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def update_token(self, token):
|
def update_token(self, token):
|
||||||
self.federation_position = token
|
self.federation_position = token
|
||||||
|
|
||||||
|
# We linearize here to ensure we don't have races updating the token
|
||||||
with (yield self._fed_position_linearizer.queue(None)):
|
with (yield self._fed_position_linearizer.queue(None)):
|
||||||
yield self.store.update_federation_out_pos(
|
if self._last_ack < self.federation_position:
|
||||||
"federation", self.federation_position
|
yield self.store.update_federation_out_pos(
|
||||||
)
|
"federation", self.federation_position
|
||||||
|
)
|
||||||
|
|
||||||
|
# We ACK this token over replication so that the master can drop
|
||||||
|
# its in memory queues
|
||||||
|
self.replication_client.send_federation_ack(self.federation_position)
|
||||||
|
self._last_ack = self.federation_position
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
Loading…
Reference in a new issue