let update_synapse_database run on a multi-database configurations (#…

…13422) * Allow sharded database in db migrate script Signed-off-by: Finn Herzfeld <[email protected]> * Update changelog.d/13422.bugfix Co-authored-by: Patrick Cloke <[email protected]> * Remove check entirely * remove unused import Signed-off-by: Finn Herzfeld <[email protected]> Co-authored-by: finn <[email protected]> Co-authored-by: Patrick Cloke <[email protected]>
matrix-org · Oct 19, 2022 · fe50738 · fe50738
1 parent 04d7f56
commit fe50738
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/changelog.d/13422.bugfix b/changelog.d/13422.bugfix
@@ -0,0 +1 @@
+Fix a long-standing bug where the `update_synapse_database` script could not be run with multiple databases. Contributed by @thefinn93 @ Beeper.
diff --git a/synapse/_scripts/update_synapse_database.py b/synapse/_scripts/update_synapse_database.py
@@ -15,7 +15,6 @@
 
 import argparse
 import logging
-import sys
 from typing import cast
 
 import yaml
@@ -100,13 +99,6 @@ def main() -> None:
     # Load, process and sanity-check the config.
     hs_config = yaml.safe_load(args.database_config)
 
-    if "database" not in hs_config and "databases" not in hs_config:
-        sys.stderr.write(
-            "The configuration file must have a 'database' or 'databases' section. "
-            "See https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#database"
-        )
-        sys.exit(4)
-
     config = HomeServerConfig()
     config.parse_config_dict(hs_config, "", "")