heimoshuiyu/rust-synapse-compress-state
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the auto compressor uploadable to pypi (#75)

Browse Source
This commit is contained in:
Erik Johnston
2021-09-28 16:57:13 +01:00
committed by GitHub
parent bf57e81f54
commit 0111079153
15 changed files with 118 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Cargo.lock generated
View File

@@ -54,26 +54,6 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "auto_compressor"
version = "0.1.0"
dependencies = [
"anyhow",
"clap",
"env_logger",
"jemallocator",
"log",
"log-panics",
"openssl",
"postgres",
"postgres-openssl",
"pyo3",
"pyo3-log",
"rand",
"serial_test",
"synapse_compress_state",
]
[[package]] [[package]]
name = "autocfg" name = "autocfg"
version = "1.0.1" version = "1.0.1"
@@ -144,7 +124,6 @@ dependencies = [
name = "compressor_integration_tests" name = "compressor_integration_tests"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"auto_compressor",
"env_logger", "env_logger",
"log", "log",
"openssl", "openssl",
@@ -154,6 +133,7 @@ dependencies = [
"serial_test", "serial_test",
"state-map", "state-map",
"string_cache", "string_cache",
"synapse_auto_compressor",
"synapse_compress_state", "synapse_compress_state",
] ]
@@ -1122,6 +1102,26 @@ dependencies = [
"unicode-xid", "unicode-xid",
] ]
[[package]]
name = "synapse_auto_compressor"
version = "0.1.1"
dependencies = [
"anyhow",
"clap",
"env_logger",
"jemallocator",
"log",
"log-panics",
"openssl",
"postgres",
"postgres-openssl",
"pyo3",
"pyo3-log",
"rand",
"serial_test",
"synapse_compress_state",
]
[[package]] [[package]]
name = "synapse_compress_state" name = "synapse_compress_state"
version = "0.1.0" version = "0.1.0"

2
Cargo.toml
View File

@@ -1,5 +1,5 @@
[workspace] [workspace]
members = ["auto_compressor", "compressor_integration_tests"] members = ["synapse_auto_compressor", "compressor_integration_tests"]
[package] [package]
authors = ["Erik Johnston"] authors = ["Erik Johnston"]

81
README.md
View File

@@ -3,7 +3,7 @@
This workspace contains experimental tools that attempt to reduce the number of This workspace contains experimental tools that attempt to reduce the number of
rows in the `state_groups_state` table inside of a Synapse Postgresql database. rows in the `state_groups_state` table inside of a Synapse Postgresql database.
# Automated tool: auto_compressor # Automated tool: synapse_auto_compressor
## Introduction: ## Introduction:
@@ -11,7 +11,7 @@ This tool is significantly more simple to use than the manual tool (described be
It scans through all of the rows in the `state_groups` database table from the start. When It scans through all of the rows in the `state_groups` database table from the start. When
it finds a group that hasn't been compressed, it runs the compressor for a while on that it finds a group that hasn't been compressed, it runs the compressor for a while on that
group's room, saving where it got up to. After compressing a number of these chunks it stops, group's room, saving where it got up to. After compressing a number of these chunks it stops,
saving where it got up to for the next run of the `auto_compressor`. saving where it got up to for the next run of the `synapse_auto_compressor`.
It creates three extra tables in the database: `state_compressor_state` which stores the It creates three extra tables in the database: `state_compressor_state` which stores the
information needed to stop and start the compressor for each room, `state_compressor_progress` information needed to stop and start the compressor for each room, `state_compressor_progress`
@@ -21,41 +21,42 @@ which stores how far through the `state_groups` table the compressor has scanned
The tool can be run manually when you are running out of space, or be scheduled to run The tool can be run manually when you are running out of space, or be scheduled to run
periodically. periodically.
## Building ## Building
This tool requires `cargo` to be installed. See https://www.rust-lang.org/tools/install This tool requires `cargo` to be installed. See https://www.rust-lang.org/tools/install
for instructions on how to do this. for instructions on how to do this.
To build `auto_compressor`, clone this repository and navigate to the `autocompressor/` To build `synapse_auto_compressor`, clone this repository and navigate to the
subdirectory. Then execute `cargo build`. `synapse_auto_compressor/` subdirectory. Then execute `cargo build`.
This will create an executable and store it in `auto_compressor/target/debug/auto_compressor`. This will create an executable and store it in
`synapse_auto_compressor/target/debug/synapse_auto_compressor`.
## Example usage ## Example usage
``` ```
$ auto_compressor -p postgresql://user:pass@localhost/synapse -c 500 -n 100 $ synapse_auto_compressor -p postgresql://user:pass@localhost/synapse -c 500 -n 100
``` ```
## Running Options ## Running Options
- -p [POSTGRES_LOCATION] **Required** - -p [POSTGRES_LOCATION] **Required**
The configuration for connecting to the Postgres database. This should be of the form The configuration for connecting to the Postgres database. This should be of the form
`"postgresql://username:password@mydomain.com/database"` or a key-value pair `"postgresql://username:password@mydomain.com/database"` or a key-value pair
string: `"user=username password=password dbname=database host=mydomain.com"` string: `"user=username password=password dbname=database host=mydomain.com"`
See https://docs.rs/tokio-postgres/0.7.2/tokio_postgres/config/struct.Config.html See https://docs.rs/tokio-postgres/0.7.2/tokio_postgres/config/struct.Config.html
for the full details. for the full details.
- -c [CHUNK_SIZE] **Required** - -c [CHUNK_SIZE] **Required**
The number of state groups to work on at once. All of the entries from state_groups_state are The number of state groups to work on at once. All of the entries from state_groups_state are
requested from the database for state groups that are worked on. Therefore small chunk requested from the database for state groups that are worked on. Therefore small chunk
sizes may be needed on machines with low memory. Note: if the compressor fails to find sizes may be needed on machines with low memory. Note: if the compressor fails to find
space savings on the chunk as a whole (which may well happen in rooms with lots of backfill space savings on the chunk as a whole (which may well happen in rooms with lots of backfill
in) then the entire chunk is skipped. in) then the entire chunk is skipped.
- -n [CHUNKS_TO_COMPRESS] **Required** - -n [CHUNKS_TO_COMPRESS] **Required**
*CHUNKS_TO_COMPRESS* chunks of size *CHUNK_SIZE* will be compressed. The higher this *CHUNKS_TO_COMPRESS* chunks of size *CHUNK_SIZE* will be compressed. The higher this
number is set to, the longer the compressor will run for. number is set to, the longer the compressor will run for.
- -d [LEVELS] - -d [LEVELS]
Sizes of each new level in the compression algorithm, as a comma-separated list. Sizes of each new level in the compression algorithm, as a comma-separated list.
The first entry in the list is for the lowest, most granular level, with each The first entry in the list is for the lowest, most granular level, with each
subsequent entry being for the next highest level. The number of entries in the subsequent entry being for the next highest level. The number of entries in the
@@ -67,14 +68,14 @@ given set of state. [defaults to "100,50,25"]
## Scheduling the compressor ## Scheduling the compressor
The automatic tool may put some strain on the database, so it might be best to schedule The automatic tool may put some strain on the database, so it might be best to schedule
it to run at a quiet time for the server. This could be done by creating an executable it to run at a quiet time for the server. This could be done by creating an executable
script and scheduling it with something like script and scheduling it with something like
[cron](https://www.man7.org/linux/man-pages/man1/crontab.1.html). [cron](https://www.man7.org/linux/man-pages/man1/crontab.1.html).
# Manual tool: synapse_compress_state # Manual tool: synapse_compress_state
## Introduction ## Introduction
A manual tool that reads in the rows from `state_groups_state` and `state_group_edges` A manual tool that reads in the rows from `state_groups_state` and `state_group_edges`
tables for a specified room and calculates the changes that could be made that tables for a specified room and calculates the changes that could be made that
(hopefully) will significantly reduce the number of rows. (hopefully) will significantly reduce the number of rows.
@@ -85,7 +86,7 @@ that if `-t` is given then each change to a particular state group is wrapped
in a transaction). If you do wish to send the changes to the database automatically in a transaction). If you do wish to send the changes to the database automatically
then the `-c` flag can be set. then the `-c` flag can be set.
The SQL generated is safe to apply against the database with Synapse running. The SQL generated is safe to apply against the database with Synapse running.
This is because the `state_groups` and `state_groups_state` tables are append-only: This is because the `state_groups` and `state_groups_state` tables are append-only:
once written to the database, they are never modified. There is therefore no danger once written to the database, they are never modified. There is therefore no danger
of a modification racing against a running Synapse. Further, this script makes its of a modification racing against a running Synapse. Further, this script makes its
@@ -95,7 +96,7 @@ from any of the queries that Synapse performs.
The tool will also ensure that the generated state deltas do give the same state The tool will also ensure that the generated state deltas do give the same state
as the existing state deltas before generating any SQL. as the existing state deltas before generating any SQL.
## Building ## Building
This tool requires `cargo` to be installed. See https://www.rust-lang.org/tools/install This tool requires `cargo` to be installed. See https://www.rust-lang.org/tools/install
for instructions on how to do this. for instructions on how to do this.
@@ -125,54 +126,54 @@ $ psql synapse < out.data
## Running Options ## Running Options
- -p [POSTGRES_LOCATION] **Required** - -p [POSTGRES_LOCATION] **Required**
The configuration for connecting to the Postgres database. This should be of the form The configuration for connecting to the Postgres database. This should be of the form
`"postgresql://username:password@mydomain.com/database"` or a key-value pair `"postgresql://username:password@mydomain.com/database"` or a key-value pair
string: `"user=username password=password dbname=database host=mydomain.com"` string: `"user=username password=password dbname=database host=mydomain.com"`
See https://docs.rs/tokio-postgres/0.7.2/tokio_postgres/config/struct.Config.html See https://docs.rs/tokio-postgres/0.7.2/tokio_postgres/config/struct.Config.html
for the full details. for the full details.
- -r [ROOM_ID] **Required** - -r [ROOM_ID] **Required**
The room to process (this is the value found in the `rooms` table of the database The room to process (this is the value found in the `rooms` table of the database
not the common name for the room - it should look like: "!wOlkWNmgkAZFxbTaqj:matrix.org". not the common name for the room - it should look like: "!wOlkWNmgkAZFxbTaqj:matrix.org".
- -b [MIN_STATE_GROUP] - -b [MIN_STATE_GROUP]
The state group to start processing from (non-inclusive). The state group to start processing from (non-inclusive).
- -n [GROUPS_TO_COMPRESS] - -n [GROUPS_TO_COMPRESS]
How many groups to load into memory to compress (starting How many groups to load into memory to compress (starting
from the 1st group in the room or the group specified by -b). from the 1st group in the room or the group specified by -b).
- -l [LEVELS] - -l [LEVELS]
Sizes of each new level in the compression algorithm, as a comma-separated list. Sizes of each new level in the compression algorithm, as a comma-separated list.
The first entry in the list is for the lowest, most granular level, with each The first entry in the list is for the lowest, most granular level, with each
subsequent entry being for the next highest level. The number of entries in the subsequent entry being for the next highest level. The number of entries in the
list determines the number of levels that will be used. The sum of the sizes of list determines the number of levels that will be used. The sum of the sizes of
the levels affects the performance of fetching the state from the database, as the the levels affects the performance of fetching the state from the database, as the
sum of the sizes is the upper bound on the number of iterations needed to fetch a sum of the sizes is the upper bound on the number of iterations needed to fetch a
given set of state. [defaults to "100,50,25"] given set of state. [defaults to "100,50,25"]
- -m [COUNT] - -m [COUNT]
If the compressor cannot save this many rows from the database then it will stop early. If the compressor cannot save this many rows from the database then it will stop early.
- -s [MAX_STATE_GROUP] - -s [MAX_STATE_GROUP]
If a max_state_group is specified then only state groups with id's lower than this If a max_state_group is specified then only state groups with id's lower than this
number can be compressed. number can be compressed.
- -o [FILE] - -o [FILE]
File to output the SQL transactions to (for later running on the database). File to output the SQL transactions to (for later running on the database).
- -t - -t
If this flag is set then each change to a particular state group is wrapped in a If this flag is set then each change to a particular state group is wrapped in a
transaction. This should be done if you wish to apply the changes while synapse is transaction. This should be done if you wish to apply the changes while synapse is
still running. still running.
- -c - -c
If this flag is set then the changes the compressor makes will be committed to the If this flag is set then the changes the compressor makes will be committed to the
database. This should be safe to use while synapse is running as it wraps the changes database. This should be safe to use while synapse is running as it wraps the changes
to every state group in it's own transaction (as if the transaction flag was set). to every state group in it's own transaction (as if the transaction flag was set).
- -g - -g
If this flag is set then output the node and edge information for the state_group If this flag is set then output the node and edge information for the state_group
directed graph built up from the predecessor state_group links. These can be looked directed graph built up from the predecessor state_group links. These can be looked
at in something like Gephi (https://gephi.org). at in something like Gephi (https://gephi.org).
@@ -196,10 +197,10 @@ $ docker-compose down
# Using the synapse_compress_state library # Using the synapse_compress_state library
If you want to use the compressor in another project, it is recomended that you If you want to use the compressor in another project, it is recomended that you
use jemalloc `https://github.com/gnzlbg/jemallocator`. use jemalloc `https://github.com/gnzlbg/jemallocator`.
To prevent the progress bars from being shown, use the `no-progress-bars` feature. To prevent the progress bars from being shown, use the `no-progress-bars` feature.
(See `auto_compressor/Cargo.toml` for an example) (See `synapse_auto_compressor/Cargo.toml` for an example)
# Troubleshooting # Troubleshooting
@@ -216,29 +217,29 @@ from the machine where Postgres is running, the url will be the following:
### From remote machine ### From remote machine
If you wish to connect from a different machine, you'll need to edit your Postgres settings to allow If you wish to connect from a different machine, you'll need to edit your Postgres settings to allow
remote connections. This requires updating the remote connections. This requires updating the
[`pg_hba.conf`](https://www.postgresql.org/docs/current/auth-pg-hba-conf.html) and the `listen_addresses` [`pg_hba.conf`](https://www.postgresql.org/docs/current/auth-pg-hba-conf.html) and the `listen_addresses`
setting in [`postgresql.conf`](https://www.postgresql.org/docs/current/runtime-config-connection.html) setting in [`postgresql.conf`](https://www.postgresql.org/docs/current/runtime-config-connection.html)
## Printing debugging logs ## Printing debugging logs
The amount of output the tools produce can be altered by setting the RUST_LOG The amount of output the tools produce can be altered by setting the RUST_LOG
environment variable to something. environment variable to something.
To get more logs when running the auto_compressor tool try the following: To get more logs when running the synapse_auto_compressor tool try the following:
``` ```
$ RUST_LOG=debug auto_compressor -p postgresql://user:pass@localhost/synapse -c 50 -n 100 $ RUST_LOG=debug synapse_auto_compressor -p postgresql://user:pass@localhost/synapse -c 50 -n 100
``` ```
If you want to suppress all the debugging info you are getting from the If you want to suppress all the debugging info you are getting from the
Postgres client then try: Postgres client then try:
``` ```
RUST_LOG=auto_compressor=debug,synapse_compress_state=debug auto_compressor [etc.] RUST_LOG=synapse_auto_compressor=debug,synapse_compress_state=debug synapse_auto_compressor [etc.]
``` ```
This will only print the debugging information from those two packages. For more info see This will only print the debugging information from those two packages. For more info see
https://docs.rs/env_logger/0.9.0/env_logger/. https://docs.rs/env_logger/0.9.0/env_logger/.
## Building difficulties ## Building difficulties
@@ -248,7 +249,7 @@ and building on Linux will also require `pkg-config`
This can be done on Ubuntu with: `$ apt-get install libssl-dev pkg-config` This can be done on Ubuntu with: `$ apt-get install libssl-dev pkg-config`
Note that building requires quite a lot of memory and out-of-memory errors might not be Note that building requires quite a lot of memory and out-of-memory errors might not be
obvious. It's recomended you only build these tools on machines with at least 2GB of RAM. obvious. It's recomended you only build these tools on machines with at least 2GB of RAM.
## Auto Compressor skips chunks when running on already compressed room ## Auto Compressor skips chunks when running on already compressed room
@@ -265,8 +266,8 @@ be a large problem.
## Compressor is trying to increase the number of rows ## Compressor is trying to increase the number of rows
Backfilling can lead to issues with compression. The auto_compressor will Backfilling can lead to issues with compression. The synapse_auto_compressor will
skip chunks it can't reduce the size of and so this should help jump over the backfilled skip chunks it can't reduce the size of and so this should help jump over the backfilled
state_groups. Lots of state resolution might also impact the ability to use the compressor. state_groups. Lots of state resolution might also impact the ability to use the compressor.
To examine the state_group hierarchy run the manual tool on a room with the `-g` option To examine the state_group hierarchy run the manual tool on a room with the `-g` option

4
compressor_integration_tests/Cargo.toml
View File

@@ -13,9 +13,9 @@ postgres = "0.19.0"
postgres-openssl = "0.5.0" postgres-openssl = "0.5.0"
rand = "0.8.0" rand = "0.8.0"
synapse_compress_state = { path = "../", features = ["no-progress-bars"] } synapse_compress_state = { path = "../", features = ["no-progress-bars"] }
auto_compressor = { path = "../auto_compressor/" } synapse_auto_compressor = { path = "../synapse_auto_compressor/" }
env_logger = "0.9.0" env_logger = "0.9.0"
log = "0.4.14" log = "0.4.14"
[dependencies.state-map] [dependencies.state-map]
git = "https://github.com/matrix-org/rust-matrix-state-map" git = "https://github.com/matrix-org/rust-matrix-state-map"

8
compressor_integration_tests/src/lib.rs
View File

@@ -179,7 +179,7 @@ fn collapse_state_with_database(state_group: i64) -> StateMap<Atom> {
// the predecessor (so have split this into a different query) // the predecessor (so have split this into a different query)
let query_pred = r#" let query_pred = r#"
SELECT prev_state_group SELECT prev_state_group
FROM state_group_edges FROM state_group_edges
WHERE state_group = $1 WHERE state_group = $1
"#; "#;
@@ -243,7 +243,7 @@ pub fn database_structure_matches_map(state_group_map: &BTreeMap<i64, StateGroup
// the predecessor (so have split this into a different query) // the predecessor (so have split this into a different query)
let query_pred = r#" let query_pred = r#"
SELECT prev_state_group SELECT prev_state_group
FROM state_group_edges FROM state_group_edges
WHERE state_group = $1 WHERE state_group = $1
"#; "#;
@@ -356,7 +356,7 @@ fn functions_are_self_consistent() {
} }
pub fn setup_logger() { pub fn setup_logger() {
// setup the logger for the auto_compressor // setup the logger for the synapse_auto_compressor
// The default can be overwritten with RUST_LOG // The default can be overwritten with RUST_LOG
// see the README for more information // see the README for more information
if env::var("RUST_LOG").is_err() { if env::var("RUST_LOG").is_err() {
@@ -366,7 +366,7 @@ pub fn setup_logger() {
// default to printing the debug information for both packages being tested // default to printing the debug information for both packages being tested
// (Note that just setting the global level to debug will log every sql transaction) // (Note that just setting the global level to debug will log every sql transaction)
log_builder.filter_module("synapse_compress_state", LevelFilter::Debug); log_builder.filter_module("synapse_compress_state", LevelFilter::Debug);
log_builder.filter_module("auto_compressor", LevelFilter::Debug); log_builder.filter_module("synapse_auto_compressor", LevelFilter::Debug);
// use try_init() incase the logger has been setup by some previous test // use try_init() incase the logger has been setup by some previous test
let _ = log_builder.try_init(); let _ = log_builder.try_init();
} else { } else {

8
compressor_integration_tests/tests/auto_compressor_manager_tests.rs
View File

@@ -1,9 +1,5 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use auto_compressor::{
manager::{compress_chunks_of_database, run_compressor_on_room_chunk},
state_saving::{connect_to_database, create_tables_if_needed},
};
use compressor_integration_tests::{ use compressor_integration_tests::{
add_contents_to_database, clear_compressor_state, database_collapsed_states_match_map, add_contents_to_database, clear_compressor_state, database_collapsed_states_match_map,
database_structure_matches_map, empty_database, database_structure_matches_map, empty_database,
@@ -14,6 +10,10 @@ use compressor_integration_tests::{
setup_logger, DB_URL, setup_logger, DB_URL,
}; };
use serial_test::serial; use serial_test::serial;
use synapse_auto_compressor::{
manager::{compress_chunks_of_database, run_compressor_on_room_chunk},
state_saving::{connect_to_database, create_tables_if_needed},
};
use synapse_compress_state::Level; use synapse_compress_state::Level;
#[test] #[test]

6
compressor_integration_tests/tests/auto_compressor_state_saving_tests.rs
View File

@@ -1,9 +1,9 @@
use auto_compressor::state_saving::{ use compressor_integration_tests::{clear_compressor_state, setup_logger, DB_URL};
use serial_test::serial;
use synapse_auto_compressor::state_saving::{
connect_to_database, create_tables_if_needed, read_room_compressor_state, connect_to_database, create_tables_if_needed, read_room_compressor_state,
write_room_compressor_state, write_room_compressor_state,
}; };
use compressor_integration_tests::{clear_compressor_state, setup_logger, DB_URL};
use serial_test::serial;
use synapse_compress_state::Level; use synapse_compress_state::Level;
#[test] #[test]

8
docs/python.md
View File

@@ -18,7 +18,7 @@ the compressor is run.
3. Navigate to the correct location 3. Navigate to the correct location
For the automatic tool: For the automatic tool:
`$ cd /home/synapse/rust-synapse-compress-state/auto_compressor` `$ cd /home/synapse/rust-synapse-compress-state/synpase_auto_compressor`
For the manual tool: For the manual tool:
`$ cd /home/synapse/rust-synapse-compress-state` `$ cd /home/synapse/rust-synapse-compress-state`
@@ -30,9 +30,9 @@ This will install the relevant compressor tool into the activated virtual enviro
## Automatic tool example: ## Automatic tool example:
```python ```python
import auto_compressor import synapse_auto_compressor
auto_compressor.compress_state_events_table( synapse_auto_compressor.compress_state_events_table(
db_url="postgresql://localhost/synapse", db_url="postgresql://localhost/synapse",
chunk_size=500, chunk_size=500,
default_levels="100,50,25", default_levels="100,50,25",
@@ -51,4 +51,4 @@ synapse_compress_state.run_compression(
output_file="out.sql", output_file="out.sql",
transactions=True transactions=True
) )
``` ```

2
src/lib.rs
View File

@@ -788,7 +788,7 @@ fn synapse_compress_state(_py: Python, m: &PyModule) -> PyResult<()> {
let _ = pyo3_log::Logger::default() let _ = pyo3_log::Logger::default()
// don't send out anything lower than a warning from other crates // don't send out anything lower than a warning from other crates
.filter(LevelFilter::Warn) .filter(LevelFilter::Warn)
// don't log warnings from synapse_compress_state, the auto_compressor handles these // don't log warnings from synapse_compress_state, the synapse_auto_compressor handles these
// situations and provides better log messages // situations and provides better log messages
.filter_target("synapse_compress_state".to_owned(), LevelFilter::Debug) .filter_target("synapse_compress_state".to_owned(), LevelFilter::Debug)
.install(); .install();

12
auto_compressor/Cargo.toml → synapse_auto_compressor/Cargo.toml
View File

@@ -1,10 +1,16 @@
[package] [package]
name = "auto_compressor" name = "synapse_auto_compressor"
authors = ["William Ashton"] authors = ["William Ashton"]
version = "0.1.0" version = "0.1.1"
edition = "2018" edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.maturin]
requires-python = ">=3.6"
project-url = {Source = "https://github.com/matrix-org/rust-synapse-compress-state"}
classifier = [
"Development Status :: 4 - Beta",
"Programming Language :: Rust",
]
[dependencies] [dependencies]
clap = "2.33.0" clap = "2.33.0"

12
synapse_auto_compressor/README.md Normal file
View File

@@ -0,0 +1,12 @@
# Auto Compressor
See the top level readme for information.
## Publishing to PyPI
Bump the version number and run from the root directory of the repo:
```
docker run -it --rm -v $(pwd):/io -e OPENSSL_STATIC=1 konstin2/maturin publish -m synapse_auto_compressor/Cargo.toml --cargo-extra-args "\--features='openssl/vendored'"
```

15
auto_compressor/src/lib.rs → synapse_auto_compressor/src/lib.rs
View File

@@ -57,15 +57,16 @@ impl FromStr for LevelInfo {
// PyO3 INTERFACE STARTS HERE // PyO3 INTERFACE STARTS HERE
#[pymodule] #[pymodule]
fn auto_compressor(_py: Python, m: &PyModule) -> PyResult<()> { fn synapse_auto_compressor(_py: Python, m: &PyModule) -> PyResult<()> {
let _ = pyo3_log::Logger::default() let _ = pyo3_log::Logger::default()
// don't send out anything lower than a warning from other crates // don't send out anything lower than a warning from other crates
.filter(LevelFilter::Warn) .filter(LevelFilter::Warn)
// don't log warnings from synapse_compress_state, the auto_compressor handles these // don't log warnings from synapse_compress_state, the
// situations and provides better log messages // synapse_auto_compressor handles these situations and provides better
// log messages
.filter_target("synapse_compress_state".to_owned(), LevelFilter::Error) .filter_target("synapse_compress_state".to_owned(), LevelFilter::Error)
// log info and above for the auto_compressor // log info and above for the synapse_auto_compressor
.filter_target("auto_compressor".to_owned(), LevelFilter::Debug) .filter_target("synapse_auto_compressor".to_owned(), LevelFilter::Debug)
.install(); .install();
// ensure any panics produce error messages in the log // ensure any panics produce error messages in the log
log_panics::init(); log_panics::init();
@@ -92,7 +93,7 @@ fn auto_compressor(_py: Python, m: &PyModule) -> PyResult<()> {
number_of_chunks: i64, number_of_chunks: i64,
) -> PyResult<()> { ) -> PyResult<()> {
// Announce the start of the program to the logs // Announce the start of the program to the logs
log::info!("auto_compressor started"); log::info!("synapse_auto_compressor started");
// Parse the default_level string into a LevelInfo struct // Parse the default_level string into a LevelInfo struct
let default_levels: LevelInfo = match default_levels.parse() { let default_levels: LevelInfo = match default_levels.parse() {
@@ -120,7 +121,7 @@ fn auto_compressor(_py: Python, m: &PyModule) -> PyResult<()> {
return Err(PyErr::new::<PyRuntimeError, _>(format!("{:?}", e))); return Err(PyErr::new::<PyRuntimeError, _>(format!("{:?}", e)));
} }
log::info!("auto_compressor finished"); log::info!("synapse_auto_compressor finished");
Ok(()) Ok(())
} }
Ok(()) Ok(())

16
auto_compressor/src/main.rs → synapse_auto_compressor/src/main.rs
View File

@@ -19,20 +19,20 @@
#[global_allocator] #[global_allocator]
static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc; static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;
use auto_compressor::{manager, state_saving, LevelInfo};
use clap::{crate_authors, crate_description, crate_name, crate_version, value_t, App, Arg}; use clap::{crate_authors, crate_description, crate_name, crate_version, value_t, App, Arg};
use log::LevelFilter; use log::LevelFilter;
use std::{env, fs::OpenOptions}; use std::{env, fs::OpenOptions};
use synapse_auto_compressor::{manager, state_saving, LevelInfo};
/// Execution starts here /// Execution starts here
fn main() { fn main() {
// setup the logger for the auto_compressor // setup the logger for the synapse_auto_compressor
// The default can be overwritten with RUST_LOG // The default can be overwritten with RUST_LOG
// see the README for more information // see the README for more information
let log_file = OpenOptions::new() let log_file = OpenOptions::new()
.append(true) .append(true)
.create(true) .create(true)
.open("auto_compressor.log") .open("synapse_auto_compressor.log")
.unwrap_or_else(|e| panic!("Error occured while opening the log file: {}", e)); .unwrap_or_else(|e| panic!("Error occured while opening the log file: {}", e));
if env::var("RUST_LOG").is_err() { if env::var("RUST_LOG").is_err() {
@@ -41,8 +41,8 @@ fn main() {
log_builder.filter_module("panic", LevelFilter::Error); log_builder.filter_module("panic", LevelFilter::Error);
// Only output errors from the synapse_compress state library // Only output errors from the synapse_compress state library
log_builder.filter_module("synapse_compress_state", LevelFilter::Error); log_builder.filter_module("synapse_compress_state", LevelFilter::Error);
// Output log levels info and above from auto_compressor // Output log levels info and above from synapse_auto_compressor
log_builder.filter_module("auto_compressor", LevelFilter::Info); log_builder.filter_module("synapse_auto_compressor", LevelFilter::Info);
log_builder.init(); log_builder.init();
} else { } else {
// If RUST_LOG was set then use that // If RUST_LOG was set then use that
@@ -54,7 +54,7 @@ fn main() {
} }
log_panics::init(); log_panics::init();
// Announce the start of the program to the logs // Announce the start of the program to the logs
log::info!("auto_compressor started"); log::info!("synapse_auto_compressor started");
// parse the command line arguments using the clap crate // parse the command line arguments using the clap crate
let arguments = App::new(crate_name!()) let arguments = App::new(crate_name!())
@@ -113,7 +113,7 @@ fn main() {
Arg::with_name("number_of_chunks") Arg::with_name("number_of_chunks")
.short("n") .short("n")
.value_name("CHUNKS_TO_COMPRESS") .value_name("CHUNKS_TO_COMPRESS")
.help("The number of chunks to compress") .help("The number of chunks to compress")
.long_help(concat!( .long_help(concat!(
"This many chunks of the database will be compressed. The higher this number is set to, ", "This many chunks of the database will be compressed. The higher this number is set to, ",
"the longer the compressor will run for." "the longer the compressor will run for."
@@ -155,5 +155,5 @@ fn main() {
manager::compress_chunks_of_database(db_url, chunk_size, &default_levels.0, number_of_chunks) manager::compress_chunks_of_database(db_url, chunk_size, &default_levels.0, number_of_chunks)
.unwrap(); .unwrap();
log::info!("auto_compressor finished"); log::info!("synapse_auto_compressor finished");
} }

0
auto_compressor/src/manager.rs → synapse_auto_compressor/src/manager.rs
View File

0
auto_compressor/src/state_saving.rs → synapse_auto_compressor/src/state_saving.rs
View File