MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-17 07:43:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2098 from matrix-org/erikj/repl_tcp_fix

Browse source 
Advance replication streams even if nothing is listening
This commit is contained in:
Erik Johnston 2017-04-04 15:40:51 +01:00 committed by GitHub
commit a76886726b
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
synapse/replication/tcp/protocol.py
View file

@ -415,16 +415,18 @@ class ServerReplicationStreamProtocol(BaseReplicationStreamProtocol):
token, row = update[0], update[1] token, row = update[0], update[1]
self.send_command(RdataCommand(stream_name, token, row)) self.send_command(RdataCommand(stream_name, token, row))
# Now we can send any updates that came in while we were subscribing
pending_rdata = self.pending_rdata.pop(stream_name, [])
for token, update in pending_rdata:
self.send_command(RdataCommand(stream_name, token, update))
# We send a POSITION command to ensure that they have an up to # We send a POSITION command to ensure that they have an up to
# date token (especially useful if we didn't send any updates # date token (especially useful if we didn't send any updates
# above) # above)
self.send_command(PositionCommand(stream_name, current_token)) self.send_command(PositionCommand(stream_name, current_token))
# Now we can send any updates that came in while we were subscribing
pending_rdata = self.pending_rdata.pop(stream_name, [])
for token, update in pending_rdata:
# Only send updates newer than the current token
if token > current_token:
self.send_command(RdataCommand(stream_name, token, update))
# They're now fully subscribed # They're now fully subscribed
self.replication_streams.add(stream_name) self.replication_streams.add(stream_name)
except Exception as e: except Exception as e:

2
synapse/replication/tcp/resource.py
View file

@ -124,7 +124,7 @@ class ReplicationStreamer(object):
# Don't bother if nothing is listening. We still need to advance # Don't bother if nothing is listening. We still need to advance
# the stream tokens otherwise they'll fall beihind forever # the stream tokens otherwise they'll fall beihind forever
for stream in self.streams: for stream in self.streams:
stream.advance_current_token() stream.discard_updates_and_advance()
return return
# If we're in the process of checking for new updates, mark that fact # If we're in the process of checking for new updates, mark that fact

7
synapse/replication/tcp/streams.py
View file

@ -89,6 +89,13 @@ class Stream(object):
""" """
self.upto_token = self.current_token() self.upto_token = self.current_token()
def discard_updates_and_advance(self):
"""Called when the stream should advance but the updates would be discarded,
e.g. when there are no currently connected workers.
"""
self.upto_token = self.current_token()
self.last_token = self.upto_token
@defer.inlineCallbacks @defer.inlineCallbacks
def get_updates(self): def get_updates(self):
"""Gets all updates since the last time this function was called (or """Gets all updates since the last time this function was called (or