diff options
| author | Erik Johnston <erikj@jki.re> | 2018-07-04 10:11:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 10:11:38 +0100 |
| commit | 13f7adf84b305e0a9f74673f8e586cf1ca943d23 (patch) | |
| tree | 25659a294ffb9a01108ec69eb6cbfb3efc7ba23c | |
| parent | Merge pull request #3474 from matrix-org/erikj/py3_auth (diff) | |
| parent | Correct newsfile (diff) | |
| download | synapse-13f7adf84b305e0a9f74673f8e586cf1ca943d23.tar.xz | |
Merge pull request #3473 from matrix-org/erikj/thread_cache
Invalidate cache on correct thread
| -rw-r--r-- | changelog.d/3473.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/events.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/3473.bugfix b/changelog.d/3473.bugfix new file mode 100644 index 0000000000..7244ab59f2 --- /dev/null +++ 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 index d816d4883c..a54abb9edd 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -801,7 +801,8 @@ class EventsStore(EventsWorkerStore): ] ) - 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, ) |