mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-11-12 22:32:29 -05:00
Reduce serialization errors in MultiWriterIdGen (#8456)
We call `_update_stream_positions_table_txn` a lot, which is an UPSERT that can conflict in `REPEATABLE READ` isolation level. Instead of doing a transaction consisting of a single query we may as well run it outside of a transaction.
This commit is contained in:
parent
52a50e8686
commit
ae5b2a72c0
7 changed files with 112 additions and 8 deletions
|
|
@ -97,3 +97,20 @@ class BaseDatabaseEngine(Generic[ConnectionType], metaclass=abc.ABCMeta):
|
|||
"""Gets a string giving the server version. For example: '3.22.0'
|
||||
"""
|
||||
...
|
||||
|
||||
@abc.abstractmethod
|
||||
def in_transaction(self, conn: Connection) -> bool:
|
||||
"""Whether the connection is currently in a transaction.
|
||||
"""
|
||||
...
|
||||
|
||||
@abc.abstractmethod
|
||||
def attempt_to_set_autocommit(self, conn: Connection, autocommit: bool):
|
||||
"""Attempt to set the connections autocommit mode.
|
||||
|
||||
When True queries are run outside of transactions.
|
||||
|
||||
Note: This has no effect on SQLite3, so callers still need to
|
||||
commit/rollback the connections.
|
||||
"""
|
||||
...
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@
|
|||
|
||||
import logging
|
||||
|
||||
from ._base import BaseDatabaseEngine, IncorrectDatabaseSetup
|
||||
from synapse.storage.engines._base import BaseDatabaseEngine, IncorrectDatabaseSetup
|
||||
from synapse.storage.types import Connection
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -119,6 +120,7 @@ class PostgresEngine(BaseDatabaseEngine):
|
|||
cursor.execute("SET synchronous_commit TO OFF")
|
||||
|
||||
cursor.close()
|
||||
db_conn.commit()
|
||||
|
||||
@property
|
||||
def can_native_upsert(self):
|
||||
|
|
@ -171,3 +173,9 @@ class PostgresEngine(BaseDatabaseEngine):
|
|||
return "%i.%i" % (numver / 10000, numver % 10000)
|
||||
else:
|
||||
return "%i.%i.%i" % (numver / 10000, (numver % 10000) / 100, numver % 100)
|
||||
|
||||
def in_transaction(self, conn: Connection) -> bool:
|
||||
return conn.status != self.module.extensions.STATUS_READY # type: ignore
|
||||
|
||||
def attempt_to_set_autocommit(self, conn: Connection, autocommit: bool):
|
||||
return conn.set_session(autocommit=autocommit) # type: ignore
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ import threading
|
|||
import typing
|
||||
|
||||
from synapse.storage.engines import BaseDatabaseEngine
|
||||
from synapse.storage.types import Connection
|
||||
|
||||
if typing.TYPE_CHECKING:
|
||||
import sqlite3 # noqa: F401
|
||||
|
|
@ -86,6 +87,7 @@ class Sqlite3Engine(BaseDatabaseEngine["sqlite3.Connection"]):
|
|||
|
||||
db_conn.create_function("rank", 1, _rank)
|
||||
db_conn.execute("PRAGMA foreign_keys = ON;")
|
||||
db_conn.commit()
|
||||
|
||||
def is_deadlock(self, error):
|
||||
return False
|
||||
|
|
@ -105,6 +107,14 @@ class Sqlite3Engine(BaseDatabaseEngine["sqlite3.Connection"]):
|
|||
"""
|
||||
return "%i.%i.%i" % self.module.sqlite_version_info
|
||||
|
||||
def in_transaction(self, conn: Connection) -> bool:
|
||||
return conn.in_transaction # type: ignore
|
||||
|
||||
def attempt_to_set_autocommit(self, conn: Connection, autocommit: bool):
|
||||
# Twisted doesn't let us set attributes on the connections, so we can't
|
||||
# set the connection to autocommit mode.
|
||||
pass
|
||||
|
||||
|
||||
# Following functions taken from: https://github.com/coleifer/peewee
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue