2 files changed, 7 insertions, 1 deletions
diff --git a/changelog.d/8726.bugfix b/changelog.d/8726.bugfix
new file mode 100644
index 0000000000..831f773a25
--- /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 a0572b2952..d1b5760c2c 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,
     )