Merge pull request #3473 from matrix-org/erikj/thread_cache

Invalidate cache on correct thread
matrix-org · Jul 4, 2018 · 13f7adf · 13f7adf
2 parents 40252d1 + abb1834
commit 13f7adf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/changelog.d/3473.bugfix b/changelog.d/3473.bugfix
@@ -0,0 +1 @@
+Invalidate cache on correct thread to avoid race
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
@@ -801,7 +801,8 @@ def _update_current_state_txn(self, txn, state_delta_by_room, max_stream_order):
                     ]
                 )
 
-                self._curr_state_delta_stream_cache.entity_has_changed(
+                txn.call_after(
+                    self._curr_state_delta_stream_cache.entity_has_changed,
                     room_id, max_stream_order,
                 )