diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-10-30 18:05:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 18:05:00 +0000 |
| commit | 0467f335847dd096913dcf404ca839f61c38758f (patch) | |
| tree | 7984c9233356a03af23416307b2017aee4ffb341 | |
| parent | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_store (diff) | |
| download | synapse-0467f335847dd096913dcf404ca839f61c38758f.tar.xz | |
fix delete_existing for _persist_events (#6300)
this is part of _retry_on_integrity_error, so should only be on _persist_events_and_state_updates
| -rw-r--r-- | changelog.d/6300.misc | 1 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/events.py | 2 | ||||
| -rw-r--r-- | synapse/storage/persist_events.py | 5 |
3 files changed, 3 insertions, 5 deletions
diff --git a/changelog.d/6300.misc b/changelog.d/6300.misc new file mode 100644 index 0000000000..0b3d7a14a1 --- /dev/null +++ b/changelog.d/6300.misc @@ -0,0 +1 @@ +Move `persist_events` out from main data store. diff --git a/synapse/storage/data_stores/main/events.py b/synapse/storage/data_stores/main/events.py index 7c3607f308..a4dab86a13 100644 --- a/synapse/storage/data_stores/main/events.py +++ b/synapse/storage/data_stores/main/events.py @@ -82,7 +82,7 @@ def _retry_on_integrity_error(func): @defer.inlineCallbacks def f(self, *args, **kwargs): try: - res = yield func(self, *args, **kwargs) + res = yield func(self, *args, delete_existing=False, **kwargs) except self.database_engine.module.IntegrityError: logger.exception("IntegrityError, retrying.") res = yield func(self, *args, delete_existing=True, **kwargs) diff --git a/synapse/storage/persist_events.py b/synapse/storage/persist_events.py index cf66225574..931dcb6558 100644 --- a/synapse/storage/persist_events.py +++ b/synapse/storage/persist_events.py @@ -260,9 +260,7 @@ class EventsPersistenceStorage(object): self._event_persist_queue.handle_queue(room_id, persisting_queue) @defer.inlineCallbacks - def _persist_events( - self, events_and_contexts, backfilled=False, delete_existing=False - ): + def _persist_events(self, events_and_contexts, backfilled=False): """Calculates the change to current state and forward extremities, and persists the given events and with those updates. @@ -412,7 +410,6 @@ class EventsPersistenceStorage(object): state_delta_for_room=state_delta_for_room, new_forward_extremeties=new_forward_extremeties, backfilled=backfilled, - delete_existing=delete_existing, ) @defer.inlineCallbacks |