This repository was archived by the owner on Apr 26, 2024. It is now read-only.
Fix synapse failing to start when python module sqlite3 is not installed #12974
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
H-Shay
commented
Jun 7, 2022
| @@ -15,6 +15,8 @@ | |||
| import logging | |||
| from typing import TYPE_CHECKING, Any, Mapping, NoReturn, Optional, Tuple, cast | |||
|
|
|||
| import psycopg2 | |||
There was a problem hiding this comment.
I reverted this change in c92f2f7 as it was causing errors.
DMRobertson
reviewed
Jun 7, 2022
| if isinstance(self.db_pool.engine, engines.PostgresEngine): | ||
| if isinstance(self.db_pool.engine, engines.postgres.PostgresEngine): |
There was a problem hiding this comment.
Oh bugger. I forgot that we use isinstance everywhere, which means that PostgresEngine and SqliteEngine need to be importable everywhere.
Argh. Maybe my advice in #12962 was wrong.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes a regression introduced 1.60.0 wherein synapse will refuse to start if the python module sqlite3 is not installed, even if Postgres is being used. Apparently some versions of python don't have sqlite3 available. This PR shifts the import statements behind a conditional guard. Fixes #12962. Reviewable commit-by-commit.