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.

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

[test-utils] run clickhouse in its own cwd #4755

Merged
merged 4 commits into from
Jan 6, 2024
Merged

[test-utils] run clickhouse in its own cwd #4755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cde4758
[𝘀𝗽𝗿] initial version
sunshowers Jan 4, 2024
bf6aa1c
Address review comment and fix tests
sunshowers Jan 6, 2024
f89b0fc
Remove stray println
sunshowers Jan 6, 2024
a5c3e9d
Fix datastore path
sunshowers Jan 6, 2024
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
18 changes: 9 additions & 9 deletions dev-tools/omicron-dev/src/bin/omicron-dev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ async fn start_single_node(port: u16) -> Result<(), anyhow::Error> {
);
println!(
"omicron-dev: using {} for ClickHouse data storage",
db_instance.data_path().display()
db_instance.data_path()
);

// Wait for the DB to exit itself (an error), or for SIGINT
Expand Down Expand Up @@ -381,39 +381,39 @@ async fn start_replicated_cluster() -> Result<(), anyhow::Error> {
);
println!(
"omicron-dev: using {} and {} for ClickHouse data storage",
cluster.replica_1.data_path().display(),
cluster.replica_2.data_path().display()
cluster.replica_1.data_path(),
cluster.replica_2.data_path()
);

// Wait for the replicas and keepers to exit themselves (an error), or for SIGINT
tokio::select! {
_ = cluster.replica_1.wait_for_shutdown() => {
cluster.replica_1.cleanup().await.context(
format!("clean up {} after shutdown", cluster.replica_1.data_path().display())
format!("clean up {} after shutdown", cluster.replica_1.data_path())
)?;
bail!("omicron-dev: ClickHouse replica 1 shutdown unexpectedly");
}
_ = cluster.replica_2.wait_for_shutdown() => {
cluster.replica_2.cleanup().await.context(
format!("clean up {} after shutdown", cluster.replica_2.data_path().display())
format!("clean up {} after shutdown", cluster.replica_2.data_path())
)?;
bail!("omicron-dev: ClickHouse replica 2 shutdown unexpectedly");
}
_ = cluster.keeper_1.wait_for_shutdown() => {
cluster.keeper_1.cleanup().await.context(
format!("clean up {} after shutdown", cluster.keeper_1.data_path().display())
format!("clean up {} after shutdown", cluster.keeper_1.data_path())
)?;
bail!("omicron-dev: ClickHouse keeper 1 shutdown unexpectedly");
}
_ = cluster.keeper_2.wait_for_shutdown() => {
cluster.keeper_2.cleanup().await.context(
format!("clean up {} after shutdown", cluster.keeper_2.data_path().display())
format!("clean up {} after shutdown", cluster.keeper_2.data_path())
)?;
bail!("omicron-dev: ClickHouse keeper 2 shutdown unexpectedly");
}
_ = cluster.keeper_3.wait_for_shutdown() => {
cluster.keeper_3.cleanup().await.context(
format!("clean up {} after shutdown", cluster.keeper_3.data_path().display())
format!("clean up {} after shutdown", cluster.keeper_3.data_path())
)?;
bail!("omicron-dev: ClickHouse keeper 3 shutdown unexpectedly");
}
Expand All @@ -436,7 +436,7 @@ async fn start_replicated_cluster() -> Result<(), anyhow::Error> {
instance
.wait_for_shutdown()
.await
.context(format!("clean up {} after SIGINT shutdown", instance.data_path().display()))?;
.context(format!("clean up {} after SIGINT shutdown", instance.data_path()))?;
};
}
}
Expand Down
Loading
Loading