diff options
| author | Finn <finn@finn.io> | 2022-10-19 11:08:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-19 19:08:40 +0100 |
| commit | fe50738e597817735aa910e3cd1e13e4792f7d9f (patch) | |
| tree | bf4a22939b9d05726db49061ae397e62c2409c88 | |
| parent | Use backend-meta edition of issue triage workflow (#14230) (diff) | |
| download | synapse-fe50738e597817735aa910e3cd1e13e4792f7d9f.tar.xz | |
let update_synapse_database run on a multi-database configurations (#13422)
* Allow sharded database in db migrate script Signed-off-by: Finn Herzfeld <finn@beeper.com> * Update changelog.d/13422.bugfix Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> * Remove check entirely * remove unused import Signed-off-by: Finn Herzfeld <finn@beeper.com> Co-authored-by: finn <finn@beeper.com> Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
| -rw-r--r-- | changelog.d/13422.bugfix | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | synapse/_scripts/update_synapse_database.py | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/changelog.d/13422.bugfix b/changelog.d/13422.bugfix new file mode 100644 index 0000000000..3a099acbe6 --- /dev/null +++ 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. \ No newline at end of file diff --git a/synapse/_scripts/update_synapse_database.py b/synapse/_scripts/update_synapse_database.py index fb1fb83f50..0adf94bba6 100755..100644 --- 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, "", "") |