Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Handle updating schema version without any deltas. (#9033)
Browse files Browse the repository at this point in the history
This can happen when using a split out state database and we've upgraded
the schema version without there being any changes in the state schema.
  • Loading branch information
erikjohnston authored Jan 7, 2021
1 parent 1b4d5d6 commit eee3c3c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
1 change: 1 addition & 0 deletions changelog.d/9033.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow bumping schema version when using split out state database.
17 changes: 10 additions & 7 deletions synapse/storage/prepare_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,16 @@ def _upgrade_existing_database(
specific_engine_extensions = (".sqlite", ".postgres")

for v in range(start_ver, SCHEMA_VERSION + 1):
logger.info("Applying schema deltas for v%d", v)
if not is_worker:
logger.info("Applying schema deltas for v%d", v)

cur.execute("DELETE FROM schema_version")
cur.execute(
"INSERT INTO schema_version (version, upgraded) VALUES (?,?)",
(v, True),
)
else:
logger.info("Checking schema deltas for v%d", v)

# We need to search both the global and per data store schema
# directories for schema updates.
Expand Down Expand Up @@ -489,12 +498,6 @@ def _upgrade_existing_database(
(v, relative_path),
)

cur.execute("DELETE FROM schema_version")
cur.execute(
"INSERT INTO schema_version (version, upgraded) VALUES (?,?)",
(v, True),
)

logger.info("Schema now up to date")


Expand Down

0 comments on commit eee3c3c

Please sign in to comment.