Skip to content

Enhanced configs for Mithril Aggregator GCP deployed environment #234

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Jun 1, 2022
Merged

Enhanced configs for Mithril Aggregator GCP deployed environment #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a8c2c8
Update Signers 'run_interval'
jpraynaud Jun 1, 2022
3f56f4c
Add info logs for Signers
jpraynaud Jun 1, 2022
81f88a0
Rename 'snapshot_interval' to 'runtime_interval' in Aggregator
jpraynaud Jun 1, 2022
5796b31
Less frequent run for Signers
jpraynaud Jun 1, 2022
745beed
Update 'run_interval' of Signers in test lab
jpraynaud Jun 1, 2022
fb612ac
Fix launch Aggregator in test lab
jpraynaud Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions mithril-aggregator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ pub struct Args {
#[clap(short, long, default_value = "dev")]
run_mode: String,

/// Snapshot interval, in seconds
/// Defaults to 4 hours
#[clap(long, default_value_t = 14400)]
snapshot_interval: u32,
/// Runtime interval, in seconds
/// Defaults to 10 minutes
#[clap(long, default_value_t = 600)]
runtime_interval: u32,

/// Directory to snapshot
#[clap(long, default_value = "/db")]
Expand Down Expand Up @@ -150,7 +150,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
let snapshot_directory = config.snapshot_directory.clone();
let handle = tokio::spawn(async move {
let runtime = AggregatorRuntime::new(
args.snapshot_interval * 1000,
args.runtime_interval * 1000,
config.network.clone(),
config.db_directory.clone(),
snapshot_directory,
Expand Down
8 changes: 4 additions & 4 deletions mithril-infra/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ services:
- AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator
- NETWORK=testnet
- PARTY_ID=0
- RUN_INTERVAL=2
- RUN_INTERVAL=60000
- DB_DIRECTORY=/db
volumes:
- ./testnet/node.db:/db
Expand All @@ -77,7 +77,7 @@ services:
- AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator
- NETWORK=testnet
- PARTY_ID=1
- RUN_INTERVAL=2
- RUN_INTERVAL=60000
- DB_DIRECTORY=/db
volumes:
- ./testnet/node.db:/db
Expand All @@ -94,7 +94,7 @@ services:
- AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator
- NETWORK=testnet
- PARTY_ID=2
- RUN_INTERVAL=2
- RUN_INTERVAL=60000
- DB_DIRECTORY=/db
volumes:
- ./testnet/node.db:/db
Expand All @@ -111,7 +111,7 @@ services:
- AGGREGATOR_ENDPOINT=http://mithril-aggregator:8080/aggregator
- NETWORK=testnet
- PARTY_ID=3
- RUN_INTERVAL=2
- RUN_INTERVAL=60000
- DB_DIRECTORY=/db
volumes:
- ./testnet/node.db:/db
Expand Down
2 changes: 1 addition & 1 deletion mithril-signer/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ RUN chown -R appuser /app/ && chmod a+x /app/bin/mithril-signer
USER appuser

# Run the executable
ENTRYPOINT ["/app/bin/mithril-signer"]
ENTRYPOINT ["/app/bin/mithril-signer","-vv"]
2 changes: 1 addition & 1 deletion mithril-test-lab/mithril-end-to-end/src/Mithril/Aggregator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ aggregatorProcess cwd port = do
]
<> baseEnv
unlessM (doesFileExist aggregator) $ failure $ "cannot find mithril-aggregator executable in expected location (" <> binDir <> ")"
pure $ (proc aggregator ["--db-directory", "db", "--server-port", show port, "--snapshot-interval", "5", "-vvv"]) {cwd, env}
pure $ (proc aggregator ["--db-directory", "db", "--server-port", show port, "--runtime-interval", "5", "-vvv"]) {cwd, env}
2 changes: 1 addition & 1 deletion mithril-test-lab/mithril-end-to-end/src/Mithril/Signer.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ signerProcess cwd aggregatorEndpoint = do
[ ("AGGREGATOR_ENDPOINT", toString aggregatorEndpoint),
("NETWORK", "testnet"),
("PARTY_ID", "0"),
("RUN_INTERVAL", "2"),
("RUN_INTERVAL", "2000"),
("DB_DIRECTORY", "db")
]
<> baseEnv
Expand Down