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

Jump to bottom

Fix merge conflict regarding clickhouse-admin #6834

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Fix merge conflict regarding clickhouse-admin #6834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 12 additions & 8 deletions nexus/reconfigurator/execution/src/clickhouse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,11 @@ pub(crate) async fn deploy_nodes(
let log = log.new(slog::o!("admin_url" => admin_url.clone()));
futs.push(Either::Left(async move {
let client = Client::new(&admin_url, log.clone());
client.generate_keeper_config(&config).await.map(|_| ()).map_err(
|e| {
client
.generate_keeper_config_and_enable(&config)
.await
.map(|_| ())
.map_err(|e| {
anyhow!(
concat!(
"failed to send config for clickhouse keeper ",
Expand All @@ -104,8 +107,7 @@ pub(crate) async fn deploy_nodes(
admin_url,
e
)
},
)
})
}));
}
for config in server_configs {
Expand All @@ -119,8 +121,11 @@ pub(crate) async fn deploy_nodes(
let log = opctx.log.new(slog::o!("admin_url" => admin_url.clone()));
futs.push(Either::Right(async move {
let client = Client::new(&admin_url, log.clone());
client.generate_server_config(&config).await.map(|_| ()).map_err(
|e| {
client
.generate_server_config_and_enable(&config)
.await
.map(|_| ())
.map_err(|e| {
anyhow!(
concat!(
"failed to send config for clickhouse server ",
Expand All @@ -131,8 +136,7 @@ pub(crate) async fn deploy_nodes(
admin_url,
e
)
},
)
})
}));
}

Expand Down
Loading