From 799af147dc3be927cead12322b9bf07fbb649eb1 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Mon, 8 Nov 2021 09:08:04 -0500 Subject: [PATCH 1/2] Fix typo in comment from #11255. --- synapse/storage/prepare_database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/storage/prepare_database.py b/synapse/storage/prepare_database.py index b5c1c14ee3d1..8b9c6adae2a7 100644 --- a/synapse/storage/prepare_database.py +++ b/synapse/storage/prepare_database.py @@ -142,7 +142,7 @@ def prepare_database( databases=databases, ) elif version_info.current_version < SCHEMA_VERSION: - # If the DB is on an older version than we expect the we refuse + # If the DB is on an older version than we expect then we refuse # to start the worker (as the main process needs to run first to # update the schema). raise UpgradeDatabaseException( From e8dad0887d7a8be3174789690f9c8774f04b68c4 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Mon, 8 Nov 2021 09:09:03 -0500 Subject: [PATCH 2/2] Newsfragment --- changelog.d/11276.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/11276.bugfix diff --git a/changelog.d/11276.bugfix b/changelog.d/11276.bugfix new file mode 100644 index 000000000000..ce7259262439 --- /dev/null +++ b/changelog.d/11276.bugfix @@ -0,0 +1 @@ +Fix rolling back Synapse version when using workers.