Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Do not always start a db txn on Postgres #14840

Merged
merged 5 commits into from
Feb 9, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/14840.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Prevent "WARNING: there is already a transaction in progress" lines appearing in PostgreSQL's logs on some occasions.
11 changes: 7 additions & 4 deletions synapse/storage/prepare_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

from synapse.config.homeserver import HomeServerConfig
from synapse.storage.database import LoggingDatabaseConnection
from synapse.storage.engines import BaseDatabaseEngine, PostgresEngine
from synapse.storage.engines import BaseDatabaseEngine, PostgresEngine, Sqlite3Engine
from synapse.storage.schema import SCHEMA_COMPAT_VERSION, SCHEMA_VERSION
from synapse.storage.types import Cursor

Expand Down Expand Up @@ -108,9 +108,12 @@ def prepare_database(
# so we start one before running anything. This ensures that any upgrades
# are either applied completely, or not at all.
#
# (psycopg2 automatically starts a transaction as soon as we run any statements
# at all, so this is redundant but harmless there.)
cur.execute("BEGIN TRANSACTION")
# psycopg2 does automatically start transactions, and while this is technically
anoadragon453 marked this conversation as resolved.
Show resolved Hide resolved
# harmless to do there as well, doing so results in nested transactions. Those
# will generate warnings in Postgres' logs per query, and we'd rather like to
# avoid doing that.
if isinstance(database_engine, Sqlite3Engine):
anoadragon453 marked this conversation as resolved.
Show resolved Hide resolved
cur.execute("BEGIN TRANSACTION")

logger.info("%r: Checking existing schema version", databases)
version_info = _get_or_create_schema_state(cur, database_engine)
Expand Down