Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 11:56:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix rolling back when using workers (#11255)

Browse source 
Fixes #11252
This commit is contained in:
Erik Johnston 2021-11-05 11:12:10 +00:00 • committed by GitHub
parent 499c44d696
commit a37df1b091
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 82 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
synapse/storage/prepare_database.py
View file

@ -133,22 +133,23 @@ def prepare_database(
# if it's a worker app, refuse to upgrade the database, to avoid multiple
# workers doing it at once.
if (
config.worker.worker_app is not None
and version_info.current_version != SCHEMA_VERSION
):
if config.worker.worker_app is None:
_upgrade_existing_database(
cur,
version_info,
database_engine,
config,
databases=databases,
)
elif version_info.current_version < SCHEMA_VERSION:
# If the DB is on an older version than we expect the we refuse
# to start the worker (as the main process needs to run first to
# update the schema).
raise UpgradeDatabaseException(
OUTDATED_SCHEMA_ON_WORKER_ERROR
% (SCHEMA_VERSION, version_info.current_version)
)
_upgrade_existing_database(
cur,
version_info,
database_engine,
config,
databases=databases,
)
else:
logger.info("%r: Initialising new database", databases)