Skip to content

[illumos-utils] Use tokio::process::Command, not std::process::Command #8141

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 8 commits into from
May 16, 2025
Merged

[illumos-utils] Use tokio::process::Command, not std::process::Command #8141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9c19ebc
Make dladm commands async
smklein May 12, 2025
31cad18
Make more illumos commands async
smklein May 12, 2025
e546327
illumos
smklein May 13, 2025
dcde221
Merge branch 'main' into async-illumos-utils
smklein May 13, 2025
3739d5e
Better async drop
smklein May 13, 2025
60e6b07
Merge branch 'main' into async-illumos-utils
smklein May 14, 2025
cd8363c
Merge branch 'main' into async-illumos-utils
smklein May 14, 2025
d776aa8
feedback
smklein May 14, 2025
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
7 changes: 4 additions & 3 deletions clickhouse-admin/src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ async fn long_running_generate_config_task(
generation_tx.clone(),
clickward,
node_settings,
);
)
.await;
if let Err(e) = response.send(result) {
error!(
&log,
Expand Down Expand Up @@ -324,7 +325,7 @@ impl NodeSettings {
}
}

fn generate_config_and_enable_svc(
async fn generate_config_and_enable_svc(
generation_tx: watch::Sender<Option<Generation>>,
clickward: Clickward,
node_settings: NodeSettings,
Expand Down Expand Up @@ -364,7 +365,7 @@ fn generate_config_and_enable_svc(
generation_tx.send_replace(Some(incoming_generation));

// Once we have generated the client we can safely enable the clickhouse_server service
Svcadm::enable_service(node_settings.fmri())?;
Svcadm::enable_service(node_settings.fmri()).await?;

Ok(output)
}
Expand Down
Loading
Loading