Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add experimental 'databases' config #6580

Merged
merged 4 commits into from Jan 6, 2020

Conversation

@erikjohnston
Copy link
Member

erikjohnston commented Dec 20, 2019

As well as add a bit of sanity checking that we've specified all the necessary data stores.

This is mainly so that we can added a sytest to make sure that a multi database configuration actually works. (A sytest PR will be incoming matrix-org/sytest#775)

@erikjohnston erikjohnston requested a review from matrix-org/synapse-core Dec 20, 2019
@richvdh
richvdh approved these changes Jan 2, 2020
Copy link
Member

richvdh left a comment

seems generally plausible


self.databases = [
DatabaseConnectionConfig(
name, db_conf, data_stores=db_conf.get("data_stores")

This comment has been minimized.

Copy link
@richvdh

richvdh Jan 2, 2020

Member

should data_stores be a required option? it feels like defaulting to "all data stores" is maybe unhelpful.

This comment has been minimized.

Copy link
@erikjohnston

erikjohnston Jan 6, 2020

Author Member

It's mainly useful so that people with a single database don't have to enumerate all the different types of data stores (on the assumption we'll want to keep splitting them out).

Potentially the correct thing here would be to default to data stores that aren't otherwise provisioned?

synapse/config/database.py Outdated Show resolved Hide resolved
@erikjohnston erikjohnston merged commit 9f6c1be into develop Jan 6, 2020
22 checks passed
22 checks passed
buildkite/synapse Build #6333 passed (14 minutes, 28 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 34 seconds)
Details
buildkite/synapse/check-style Passed (1 minute, 37 seconds)
Details
buildkite/synapse/isort Passed (37 seconds)
Details
buildkite/synapse/mypy Passed (30 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (18 seconds)
Details
buildkite/synapse/packaging Passed (38 seconds)
Details
buildkite/synapse/pipeline Passed (3 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (10 minutes, 39 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (6 minutes, 53 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite-slash-old-deps Passed (7 minutes, 25 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (5 minutes, 58 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (10 minutes, 16 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (9 minutes, 42 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (5 minutes, 48 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-5-slash-postgres-9-dot-5 Passed (1 minute, 36 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-7-slash-postgres-11 Passed (1 minute, 56 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-monolith Passed (10 minutes, 54 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-workers Passed (12 minutes, 32 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-sqlite-slash-monolith Passed (11 minutes, 31 seconds)
Details
buildkite/synapse/sytest-python-3-dot-7-slash-postgres-11-slash-monolith Passed (9 minutes, 38 seconds)
Details
buildkite/synapse/sytest-python-3-dot-7-slash-postgres-11-slash-workers Passed (10 minutes, 53 seconds)
Details
@erikjohnston erikjohnston deleted the erikj/add_experimental_db_config branch Jan 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.