Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-24 23:49:22 -05:00
Code Issues Packages Projects Releases 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

10
synapse/storage/_base.py
View File

@ -159,10 +159,20 @@ class LoggingTransaction(object):
start = time.time() * 1000 start = time.time() * 1000
try:
i = 0
N = 5
while True:
try: try:
return self.txn.execute( return self.txn.execute(
sql, *args, **kwargs 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: except Exception as e:
logger.debug("[SQL FAIL] {%s} %s", self.name, e) logger.debug("[SQL FAIL] {%s} %s", self.name, e)
raise raise

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

@ -40,3 +40,8 @@ class MariaEngine(object):
) )
db_conn.commit() db_conn.commit()
prepare_database(db_conn, self) 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): def prepare_database(self, db_conn):
prepare_sqlite3_database(db_conn) prepare_sqlite3_database(db_conn)
prepare_database(db_conn, self) prepare_database(db_conn, self)
def is_deadlock(self, error):
return False