From c2d4467cd435851484b29685959124c541d47842 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 12 Nov 2020 14:26:24 +0000 Subject: [PATCH] Enable reconnection in DB pool (#8726) `adbapi.ConnectionPool` let's you turn on auto reconnect of DB connections. This is off by default. As far as I can tell if its not enabled dead connections never get removed from the pool. Maybe helps #8574 --- changelog.d/8726.bugfix | 1 + synapse/storage/database.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 changelog.d/8726.bugfix diff --git a/changelog.d/8726.bugfix b/changelog.d/8726.bugfix new file mode 100644 index 000000000..831f773a2 --- /dev/null +++ b/changelog.d/8726.bugfix @@ -0,0 +1 @@ +Fix bug where Synapse would not recover after losing connection to the database. diff --git a/synapse/storage/database.py b/synapse/storage/database.py index a0572b295..d1b5760c2 100644 --- a/synapse/storage/database.py +++ b/synapse/storage/database.py @@ -88,13 +88,18 @@ def make_pool( """Get the connection pool for the database. """ + # By default enable `cp_reconnect`. We need to fiddle with db_args in case + # someone has explicitly set `cp_reconnect`. + db_args = dict(db_config.config.get("args", {})) + db_args.setdefault("cp_reconnect", True) + return adbapi.ConnectionPool( db_config.config["name"], cp_reactor=reactor, cp_openfun=lambda conn: engine.on_new_connection( LoggingDatabaseConnection(conn, engine, "on_new_connection") ), - **db_config.config.get("args", {}), + **db_args, )