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 /synapse/storage/data_stores | |
| 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
Diffstat (limited to 'synapse/storage/data_stores')
| -rw-r--r-- | synapse/storage/data_stores/main/events.py | 2 |
1 files changed, 1 insertions, 1 deletions
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) |