diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-09-04 10:19:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 10:19:42 +0100 |
| commit | 9f8abdcc3828e942f09cc62e29dff93dbaa01ec7 (patch) | |
| tree | 5811a075386a883af3e9da43c6123beb812d70c4 /synapse/storage/databases/main/events.py | |
| parent | Add type hints to more handlers (#8244) (diff) | |
| download | synapse-9f8abdcc3828e942f09cc62e29dff93dbaa01ec7.tar.xz | |
Revert "Add experimental support for sharding event persister. (#8170)" (#8242)
* Revert "Add experimental support for sharding event persister. (#8170)" This reverts commit 82c1ee1c22a87b9e6e3179947014b0f11c0a1ac3. * Changelog
Diffstat (limited to 'synapse/storage/databases/main/events.py')
| -rw-r--r-- | synapse/storage/databases/main/events.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py index b94fe7ac17..b3d27a2ee7 100644 --- a/synapse/storage/databases/main/events.py +++ b/synapse/storage/databases/main/events.py @@ -97,7 +97,6 @@ class PersistEventsStore: self.store = main_data_store self.database_engine = db.engine self._clock = hs.get_clock() - self._instance_name = hs.get_instance_name() self._ephemeral_messages_enabled = hs.config.enable_ephemeral_messages self.is_mine_id = hs.is_mine_id @@ -109,7 +108,7 @@ class PersistEventsStore: # This should only exist on instances that are configured to write assert ( - hs.get_instance_name() in hs.config.worker.writers.events + hs.config.worker.writers.events == hs.get_instance_name() ), "Can only instantiate EventsStore on master" async def _persist_events_and_state_updates( @@ -801,7 +800,6 @@ class PersistEventsStore: table="events", values=[ { - "instance_name": self._instance_name, "stream_ordering": event.internal_metadata.stream_ordering, "topological_ordering": event.depth, "depth": event.depth, |