Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions Cargo.lock

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

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ members = [
"sled-agent/api",
"sled-agent/bootstrap-agent-api",
"sled-agent/config-reconciler",
"sled-agent/health-monitor",
"sled-agent/repo-depot-api",
"sled-agent/types",
"sled-agent/zone-images",
Expand Down Expand Up @@ -291,6 +292,7 @@ default-members = [
"sled-agent/api",
"sled-agent/bootstrap-agent-api",
"sled-agent/config-reconciler",
"sled-agent/health-monitor",
"sled-agent/repo-depot-api",
"sled-agent/types",
"sled-agent/zone-images",
Expand Down Expand Up @@ -711,6 +713,7 @@ sled = "=0.34.7"
sled-agent-api = { path = "sled-agent/api" }
sled-agent-client = { path = "clients/sled-agent-client" }
sled-agent-config-reconciler = { path = "sled-agent/config-reconciler" }
sled-agent-health-monitor = { path = "sled-agent/health-monitor" }
sled-agent-types = { path = "sled-agent/types" }
sled-agent-zone-images = { path = "sled-agent/zone-images" }
sled-agent-zone-images-examples = { path = "sled-agent/zone-images-examples" }
Expand Down
3 changes: 3 additions & 0 deletions illumos-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ bhyve_api.workspace = true
byteorder.workspace = true
camino.workspace = true
camino-tempfile.workspace = true
chrono.workspace = true
cfg-if.workspace = true
crucible-smf.workspace = true
debug-ignore.workspace = true
Expand All @@ -34,6 +35,8 @@ oxnet.workspace = true
schemars.workspace = true
serde.workspace = true
slog.workspace = true
slog-async.workspace = true
slog-term.workspace = true
slog-error-chain.workspace = true
smf.workspace = true
thiserror.workspace = true
Expand Down
5 changes: 3 additions & 2 deletions illumos-utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//! Wrappers around illumos-specific commands.

use dropshot::HttpError;
use slog_error_chain::InlineErrorChain;
use slog_error_chain::{InlineErrorChain, SlogInlineError};
#[allow(unused)]
use std::sync::atomic::{AtomicBool, Ordering};

Expand All @@ -28,6 +28,7 @@ pub mod scf;
pub mod smf_helper;
pub mod svc;
pub mod svcadm;
pub mod svcs;
pub mod vmm_reservoir;
pub mod zfs;
pub mod zone;
Expand Down Expand Up @@ -58,7 +59,7 @@ impl std::fmt::Display for CommandFailureInfo {
}
}

#[derive(thiserror::Error, Debug)]
#[derive(thiserror::Error, Debug, SlogInlineError)]
pub enum ExecutionError {
#[error("Failed to start execution of [{command}]: {err}")]
ExecutionStart { command: String, err: std::io::Error },
Expand Down
Loading
Loading