Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2713 from matrix-org/rav/no_upsert_forever 

Avoid retrying forever on IntegrityError
This commit is contained in:
Richard van der Hoff 2017-11-27 12:19:35 +00:00 committed by GitHub
parent df6c72ede3 63ccaa5873
commit 84b31a3e7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/storage/_base.py
View File

@ -495,6 +495,7 @@ class SQLBaseStore(object):
Deferred(bool): True if a new entry was created, False if an Deferred(bool): True if a new entry was created, False if an
existing one was updated. existing one was updated.
""" """
attempts = 0
while True: while True:
try: try:
result = yield self.runInteraction( result = yield self.runInteraction(
@ -504,6 +505,12 @@ class SQLBaseStore(object):
) )
defer.returnValue(result) defer.returnValue(result)
except self.database_engine.module.IntegrityError as e: except self.database_engine.module.IntegrityError as e:
attempts += 1
if attempts >= 5:
# don't retry forever, because things other than races
# can cause IntegrityErrors
raise
# presumably we raced with another transaction: let's retry. # presumably we raced with another transaction: let's retry.
logger.warn( logger.warn(
"IntegrityError when upserting into %s; retrying: %s", "IntegrityError when upserting into %s; retrying: %s",