Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-25 10:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle the fact that postgres databases can be restarted from under us

Browse Source
This commit is contained in:
Erik Johnston 2015-04-27 12:40:49 +01:00
parent 865398b4a9
commit e4c4664d73
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
synapse/storage/_base.py
View File

@ -300,6 +300,9 @@ class SQLBaseStore(object):
def inner_func(conn, *args, **kwargs): def inner_func(conn, *args, **kwargs):
with LoggingContext("runInteraction") as context: with LoggingContext("runInteraction") as context:
if self.database_engine.is_connection_closed(conn):
conn.reconnect()
current_context.copy_to(context) current_context.copy_to(context)
start = time.time() * 1000 start = time.time() * 1000
txn_id = self._TXN_ID txn_id = self._TXN_ID
@ -322,12 +325,35 @@ class SQLBaseStore(object):
LoggingTransaction(txn, name, self.database_engine), LoggingTransaction(txn, name, self.database_engine),
*args, **kwargs *args, **kwargs
) )
except self.database_engine.module.OperationalError as e:
# This can happen if the database disappears mid
# transaction.
logger.warn(
"[TXN OPERROR] {%s} %s %d/%d",
name, e, i, N
)
if i < N:
i += 1
try:
conn.rollback()
except self.database_engine.module.Error as e1:
logger.warn(
"[TXN EROLL] {%s} %s",
name, e1,
)
continue
except self.database_engine.module.DatabaseError as e: except self.database_engine.module.DatabaseError as e:
if self.database_engine.is_deadlock(e): if self.database_engine.is_deadlock(e):
logger.warn("[TXN DEADLOCK] {%s} %d/%d", name, i, N) logger.warn("[TXN DEADLOCK] {%s} %d/%d", name, i, N)
if i < N: if i < N:
i += 1 i += 1
try:
conn.rollback() conn.rollback()
except self.database_engine.module.Error as e1:
logger.warn(
"[TXN EROLL] {%s} %s",
name, e1,
)
continue continue
raise raise
except Exception as e: except Exception as e:

3
synapse/storage/engines/postgres.py
View File

@ -39,3 +39,6 @@ class PostgresEngine(object):
if isinstance(error, self.module.DatabaseError): if isinstance(error, self.module.DatabaseError):
return error.pgcode in ["40001", "40P01"] return error.pgcode in ["40001", "40P01"]
return False return False
def is_connection_closed(self, conn):
return bool(conn)

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

@ -35,3 +35,6 @@ class Sqlite3Engine(object):
def is_deadlock(self, error): def is_deadlock(self, error):
return False return False
def is_connection_closed(self, conn):
return False