diff options
| author | Erik Johnston <erikj@jki.re> | 2017-02-13 12:20:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 12:20:21 +0100 |
| commit | 6bba80241c22fbf702419c0cea57dfcbc7144b30 (patch) | |
| tree | a2e2a9f5f619711651bebb25c2eb1d62c5e9ba6d | |
| parent | Merge pull request #1907 from andrewshadura/develop (diff) | |
| parent | Add db functions needed for room initial sync to slave (diff) | |
| download | synapse-6bba80241c22fbf702419c0cea57dfcbc7144b30.tar.xz | |
Merge pull request #1912 from matrix-org/markjh/roominitialsync
Add db functions needed for room initial sync to slave
| -rw-r--r-- | synapse/app/synchrotron.py | 4 | ||||
| -rw-r--r-- | synapse/replication/slave/storage/account_data.py | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index b3fb408cfd..3f29595256 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -87,6 +87,10 @@ class SynchrotronSlavedStore( RoomMemberStore.__dict__["who_forgot_in_room"] ) + did_forget = ( + RoomMemberStore.__dict__["did_forget"] + ) + # XXX: This is a bit broken because we don't persist the accepted list in a # way that can be replicated. This means that we don't have a way to # invalidate the cache correctly. diff --git a/synapse/replication/slave/storage/account_data.py b/synapse/replication/slave/storage/account_data.py index 735c03c7eb..77c64722c7 100644 --- a/synapse/replication/slave/storage/account_data.py +++ b/synapse/replication/slave/storage/account_data.py @@ -46,6 +46,12 @@ class SlavedAccountDataStore(BaseSlavedStore): ) get_tags_for_user = TagsStore.__dict__["get_tags_for_user"] + get_tags_for_room = ( + DataStore.get_tags_for_room.__func__ + ) + get_account_data_for_room = ( + DataStore.get_account_data_for_room.__func__ + ) get_updated_tags = DataStore.get_updated_tags.__func__ get_updated_account_data_for_user = ( |