diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-12 10:10:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-12 10:10:15 +0100 |
| commit | d1c217c823732e0af818148389d94749611aadee (patch) | |
| tree | bc869b71bdd4d939c6f439666e65134ba0e775e5 | |
| parent | Merge pull request #1095 from matrix-org/erikj/batch_edus (diff) | |
| parent | Comment (diff) | |
| download | synapse-d1c217c823732e0af818148389d94749611aadee.tar.xz | |
Merge pull request #1097 from matrix-org/erikj/replication_typing_rest
Correctly handle typing stream id resetting
| -rw-r--r-- | synapse/app/synchrotron.py | 3 | ||||
| -rw-r--r-- | synapse/replication/resource.py | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 07d3d047c6..dbaa48035d 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -242,6 +242,9 @@ class SynchrotronTyping(object): self._room_typing = {} def stream_positions(self): + # We must update this typing token from the response of the previous + # sync. In particular, the stream id may "reset" back to zero/a low + # value which we *must* use for the next replication request. return {"typing": self._latest_room_serial} def process_replication(self, result): diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py index 857bc9795c..299e9419a4 100644 --- a/synapse/replication/resource.py +++ b/synapse/replication/resource.py @@ -274,11 +274,18 @@ class ReplicationResource(Resource): @defer.inlineCallbacks def typing(self, writer, current_token, request_streams): - current_position = current_token.presence + current_position = current_token.typing request_typing = request_streams.get("typing") if request_typing is not None: + # If they have a higher token than current max, we can assume that + # they had been talking to a previous instance of the master. Since + # we reset the token on restart, the best (but hacky) thing we can + # do is to simply resend down all the typing notifications. + if request_typing > current_position: + request_typing = 0 + typing_rows = yield self.typing_handler.get_all_typing_updates( request_typing, current_position ) |