OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #781 from matrix-org/markjh/replication_problems 

Fix a bug in replication that was causing the pusher to tight loop
pull/783/head
Mark Haines 2016-05-13 12:05:19 +01:00
parent 048b3ece36 0e792e7903
commit cdda850ce1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/replication/resource.py
View File

@ -164,8 +164,8 @@ class ReplicationResource(Resource):
"Replicating %d rows of %s from %s -> %s", "Replicating %d rows of %s from %s -> %s",
len(stream_content["rows"]), len(stream_content["rows"]),
stream_name, stream_name,
stream_content["position"],
request_streams.get(stream_name), request_streams.get(stream_name),
stream_content["position"],
) )
request.write(json.dumps(result, ensure_ascii=False)) request.write(json.dumps(result, ensure_ascii=False))

2
synapse/replication/slave/storage/events.py
View File

@ -146,12 +146,14 @@ class SlavedEventStore(BaseSlavedStore):
stream = result.get("forward_ex_outliers") stream = result.get("forward_ex_outliers")
if stream: if stream:
self._stream_id_gen.advance(stream["position"])
for row in stream["rows"]: for row in stream["rows"]:
event_id = row[1] event_id = row[1]
self._invalidate_get_event_cache(event_id) self._invalidate_get_event_cache(event_id)
stream = result.get("backward_ex_outliers") stream = result.get("backward_ex_outliers")
if stream: if stream:
self._backfill_id_gen.advance(-stream["position"])
for row in stream["rows"]: for row in stream["rows"]:
event_id = row[1] event_id = row[1]
self._invalidate_get_event_cache(event_id) self._invalidate_get_event_cache(event_id)