mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-22 17:46:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Retry on deadlock

Browse source
This commit is contained in:
Erik Johnston 2015-04-07 15:28:37 +01:00
parent 0bfa78b39b
commit 49d6aa1394
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
synapse/storage/_base.py
View file

@ -160,9 +160,19 @@ class LoggingTransaction(object):
start = time.time() * 1000
try:
return self.txn.execute(
sql, *args, **kwargs
)
i = 0
N = 5
while True:
try:
return self.txn.execute(
sql, *args, **kwargs
)
except self.database_engine.module.DatabaseError as e:
if self.database_engine.is_deadlock(e) and i < N:
i += 1
logger.warn("[SQL DEADLOCK] {%s}", self.name)
continue
raise
except Exception as e:
logger.debug("[SQL FAIL] {%s} %s", self.name, e)
raise

5
synapse/storage/engines/maria.py
View file

@ -40,3 +40,8 @@ class MariaEngine(object):
)
db_conn.commit()
prepare_database(db_conn, self)
def is_deadlock(self, error):
if isinstance(error, self.module.InternalError):
return error.sqlstate == 40001 and error.errno == 1213
return False

3
synapse/storage/engines/sqlite3.py
View file

@ -32,3 +32,6 @@ class Sqlite3Engine(object):
def prepare_database(self, db_conn):
prepare_sqlite3_database(db_conn)
prepare_database(db_conn, self)
def is_deadlock(self, error):
return False