This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Add dev script to generate full SQL schema files #6394
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
9415dda
Add dev script to generate full SQL schemas.
anoadragon453 f6eff4b
Add changelog
anoadragon453 a6e0c40
Apply suggestions from code review
anoadragon453 9b6e8e2
Address review comments
anoadragon453 be14648
Factor out fix for synapse_port_db
anoadragon453 6f818ef
More fixes
anoadragon453 9b7d574
Rename script to not conflict with generate_sample_config
anoadragon453 1a768ec
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/upd…
anoadragon453 cb78f36
wip Address review comments
anoadragon453 495cde7
Change default output dir to ./full_schema
anoadragon453 eae3127
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/upd…
anoadragon453 6a93bd1
Small cleanup and remove applied_module_schemas sed
anoadragon453 d125d18
Make output directory mandatory
anoadragon453 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Add a develop script to generate full SQL schemas. |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,184 @@ | ||
#!/bin/bash | ||
# | ||
# This script generates SQL files for creating a brand new Synapse DB with the latest | ||
# schema, on both SQLite3 and Postgres. | ||
# | ||
# It does so by having Synapse generate an up-to-date SQLite DB, then running | ||
# synapse_port_db to convert it to Postgres. It then dumps the contents of both. | ||
|
||
POSTGRES_HOST="localhost" | ||
POSTGRES_DB_NAME="synapse_full_schema.$$" | ||
|
||
SQLITE_FULL_SCHEMA_OUTPUT_FILE="full.sql.sqlite" | ||
POSTGRES_FULL_SCHEMA_OUTPUT_FILE="full.sql.postgres" | ||
|
||
REQUIRED_DEPS=("matrix-synapse" "psycopg2") | ||
|
||
usage() { | ||
echo | ||
echo "Usage: $0 -p <postgres_username> -o <path> [-c] [-n] [-h]" | ||
echo | ||
echo "-p <postgres_username>" | ||
echo " Username to connect to local postgres instance. The password will be requested" | ||
echo " during script execution." | ||
echo "-c" | ||
echo " CI mode. Enables coverage tracking and prints every command that the script runs." | ||
echo "-o <path>" | ||
echo " Directory to output full schema files to." | ||
echo "-h" | ||
echo " Display this help text." | ||
} | ||
|
||
while getopts "p:co:h" opt; do | ||
case $opt in | ||
p) | ||
POSTGRES_USERNAME=$OPTARG | ||
;; | ||
c) | ||
# Print all commands that are being executed | ||
set -x | ||
|
||
# Modify required dependencies for coverage | ||
REQUIRED_DEPS+=("coverage" "coverage-enable-subprocess") | ||
|
||
COVERAGE=1 | ||
;; | ||
o) | ||
command -v realpath > /dev/null || (echo "The -o flag requires the 'realpath' binary to be installed" && exit 1) | ||
OUTPUT_DIR="$(realpath "$OPTARG")" | ||
;; | ||
h) | ||
usage | ||
exit | ||
;; | ||
\?) | ||
echo "ERROR: Invalid option: -$OPTARG" >&2 | ||
usage | ||
exit | ||
;; | ||
esac | ||
done | ||
|
||
# Check that required dependencies are installed | ||
unsatisfied_requirements=() | ||
for dep in "${REQUIRED_DEPS[@]}"; do | ||
pip show "$dep" --quiet || unsatisfied_requirements+=("$dep") | ||
done | ||
if [ ${#unsatisfied_requirements} -ne 0 ]; then | ||
echo "Please install the following python packages: ${unsatisfied_requirements[*]}" | ||
exit 1 | ||
fi | ||
|
||
if [ -z "$POSTGRES_USERNAME" ]; then | ||
echo "No postgres username supplied" | ||
usage | ||
exit 1 | ||
fi | ||
|
||
if [ -z "$OUTPUT_DIR" ]; then | ||
echo "No output directory supplied" | ||
usage | ||
exit 1 | ||
fi | ||
|
||
# Create the output directory if it doesn't exist | ||
mkdir -p "$OUTPUT_DIR" | ||
|
||
read -rsp "Postgres password for '$POSTGRES_USERNAME': " POSTGRES_PASSWORD | ||
echo "" | ||
|
||
# Exit immediately if a command fails | ||
set -e | ||
|
||
# cd to root of the synapse directory | ||
cd "$(dirname "$0")/.." | ||
|
||
# Create temporary SQLite and Postgres homeserver db configs and key file | ||
TMPDIR=$(mktemp -d) | ||
KEY_FILE=$TMPDIR/test.signing.key # default Synapse signing key path | ||
SQLITE_CONFIG=$TMPDIR/sqlite.conf | ||
SQLITE_DB=$TMPDIR/homeserver.db | ||
POSTGRES_CONFIG=$TMPDIR/postgres.conf | ||
|
||
# Ensure these files are delete on script exit | ||
trap 'rm -rf $TMPDIR' EXIT | ||
|
||
cat > "$SQLITE_CONFIG" <<EOF | ||
server_name: "test" | ||
|
||
signing_key_path: "$KEY_FILE" | ||
macaroon_secret_key: "abcde" | ||
|
||
report_stats: false | ||
|
||
database: | ||
name: "sqlite3" | ||
args: | ||
database: "$SQLITE_DB" | ||
|
||
# Suppress the key server warning. | ||
trusted_key_servers: [] | ||
EOF | ||
|
||
cat > "$POSTGRES_CONFIG" <<EOF | ||
server_name: "test" | ||
|
||
signing_key_path: "$KEY_FILE" | ||
macaroon_secret_key: "abcde" | ||
|
||
report_stats: false | ||
|
||
database: | ||
name: "psycopg2" | ||
args: | ||
user: "$POSTGRES_USERNAME" | ||
host: "$POSTGRES_HOST" | ||
password: "$POSTGRES_PASSWORD" | ||
database: "$POSTGRES_DB_NAME" | ||
|
||
# Suppress the key server warning. | ||
trusted_key_servers: [] | ||
EOF | ||
|
||
# Generate the server's signing key. | ||
echo "Generating SQLite3 db schema..." | ||
python -m synapse.app.homeserver --generate-keys -c "$SQLITE_CONFIG" | ||
|
||
# Make sure the SQLite3 database is using the latest schema and has no pending background update. | ||
echo "Running db background jobs..." | ||
scripts-dev/update_database --database-config "$SQLITE_CONFIG" | ||
|
||
# Create the PostgreSQL database. | ||
echo "Creating postgres database..." | ||
createdb $POSTGRES_DB_NAME | ||
|
||
echo "Copying data from SQLite3 to Postgres with synapse_port_db..." | ||
if [ -z "$COVERAGE" ]; then | ||
# No coverage needed | ||
scripts/synapse_port_db --sqlite-database "$SQLITE_DB" --postgres-config "$POSTGRES_CONFIG" | ||
else | ||
# Coverage desired | ||
coverage run scripts/synapse_port_db --sqlite-database "$SQLITE_DB" --postgres-config "$POSTGRES_CONFIG" | ||
fi | ||
|
||
# Delete schema_version, applied_schema_deltas and applied_module_schemas tables | ||
# This needs to be done after synapse_port_db is run | ||
echo "Dropping unwanted db tables..." | ||
SQL=" | ||
DROP TABLE schema_version; | ||
DROP TABLE applied_schema_deltas; | ||
DROP TABLE applied_module_schemas; | ||
" | ||
sqlite3 "$SQLITE_DB" <<< "$SQL" | ||
psql $POSTGRES_DB_NAME -U "$POSTGRES_USERNAME" -w <<< "$SQL" | ||
|
||
echo "Dumping SQLite3 schema to '$OUTPUT_DIR/$SQLITE_FULL_SCHEMA_OUTPUT_FILE'..." | ||
sqlite3 "$SQLITE_DB" ".dump" > "$OUTPUT_DIR/$SQLITE_FULL_SCHEMA_OUTPUT_FILE" | ||
|
||
echo "Dumping Postgres schema to '$OUTPUT_DIR/$POSTGRES_FULL_SCHEMA_OUTPUT_FILE'..." | ||
pg_dump --format=plain --no-tablespaces --no-acl --no-owner $POSTGRES_DB_NAME | sed -e '/^--/d' -e 's/public\.//g' -e '/^SET /d' -e '/^SELECT /d' > "$OUTPUT_DIR/$POSTGRES_FULL_SCHEMA_OUTPUT_FILE" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removing
Note that passing This probably explains #13873 (comment). |
||
|
||
echo "Cleaning up temporary Postgres database..." | ||
dropdb $POSTGRES_DB_NAME | ||
|
||
echo "Done! Files dumped to: $OUTPUT_DIR" |
13 changes: 13 additions & 0 deletions
13
synapse/storage/data_stores/main/schema/full_schemas/README.md
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# Building full schema dumps | ||
|
||
These schemas need to be made from a database that has had all background updates run. | ||
|
||
To do so, use `scripts-dev/make_full_schema.sh`. This will produce | ||
`full.sql.postgres ` and `full.sql.sqlite` files. | ||
|
||
Ensure postgres is installed and your user has the ability to run bash commands | ||
such as `createdb`. | ||
|
||
``` | ||
./scripts-dev/make_full_schema.sh -p postgres_username -o output_dir/ | ||
``` |
19 changes: 0 additions & 19 deletions
19
synapse/storage/data_stores/main/schema/full_schemas/README.txt
This file was deleted.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so what happens if you don't set this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks for
test.signing.key
in the current directory, not the temp dir.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be a bug. It's due to
config_dir_path
being""
here:synapse/synapse/config/key.py
Line 97 in 54fef09
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
well, that doesn't sound right. Ok, let's not get distracted by going on a bughunt now.