diff options
| author | Erik Johnston <erik@matrix.org> | 2020-02-28 11:15:11 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-02-28 11:15:11 +0000 |
| commit | c3c6c0e6222cc1bc8ae35a66389dc428d0ddbc92 (patch) | |
| tree | 28c9a4934d9b42a7e400eda9f4f02d85608230df | |
| parent | Fixed set a user as an admin with the new API (#6928) (diff) | |
| download | synapse-c3c6c0e6222cc1bc8ae35a66389dc428d0ddbc92.tar.xz | |
Add 'device_lists_outbound_pokes' as extra table.
This makes sure we check all the relevant tables to get the current max stream ID. Currently not doing so isn't problematic as the max stream ID in `device_lists_outbound_pokes` is the same as in `device_lists_stream`, however that will change.
| -rw-r--r-- | synapse/replication/slave/storage/devices.py | 8 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/__init__.py | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/synapse/replication/slave/storage/devices.py b/synapse/replication/slave/storage/devices.py index 1c77687eea..bf46cc4f8a 100644 --- a/synapse/replication/slave/storage/devices.py +++ b/synapse/replication/slave/storage/devices.py @@ -29,7 +29,13 @@ class SlavedDeviceStore(EndToEndKeyWorkerStore, DeviceWorkerStore, BaseSlavedSto self.hs = hs self._device_list_id_gen = SlavedIdTracker( - db_conn, "device_lists_stream", "stream_id" + db_conn, + "device_lists_stream", + "stream_id", + extra_tables=[ + ("user_signature_stream", "stream_id"), + ("device_lists_outbound_pokes", "stream_id"), + ], ) device_list_max = self._device_list_id_gen.get_current_token() self._device_list_stream_cache = StreamChangeCache( diff --git a/synapse/storage/data_stores/main/__init__.py b/synapse/storage/data_stores/main/__init__.py index acca079f23..649e835303 100644 --- a/synapse/storage/data_stores/main/__init__.py +++ b/synapse/storage/data_stores/main/__init__.py @@ -144,7 +144,10 @@ class DataStore( db_conn, "device_lists_stream", "stream_id", - extra_tables=[("user_signature_stream", "stream_id")], + extra_tables=[ + ("user_signature_stream", "stream_id"), + ("device_lists_outbound_pokes", "stream_id"), + ], ) self._cross_signing_id_gen = StreamIdGenerator( db_conn, "e2e_cross_signing_keys", "stream_id" |