Merge pull request matrix-org#2062 from matrix-org/erikj/presence_rep…

…lication Use presence replication stream to invalidate cache
APwhitehat · Mar 24, 2017 · 281553a · 281553a
2 parents 31d56c3 + 987f494
commit 281553a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/synapse/replication/slave/storage/presence.py b/synapse/replication/slave/storage/presence.py
@@ -57,5 +57,6 @@ def process_replication(self, result):
                 self.presence_stream_cache.entity_has_changed(
                     user_id, position
                 )
+                self._get_presence_for_user.invalidate((user_id,))
 
         return super(SlavedPresenceStore, self).process_replication(result)
diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py
@@ -85,8 +85,8 @@ def _update_presence_txn(self, txn, stream_orderings, presence_states):
                 self.presence_stream_cache.entity_has_changed,
                 state.user_id, stream_id,
             )
-            self._invalidate_cache_and_stream(
-                txn, self._get_presence_for_user, (state.user_id,)
+            txn.call_after(
+                self._get_presence_for_user.invalidate, (state.user_id,)
             )
 
         # Actually insert new rows