Skip to content

Bump crucible and propolis revs to latest #10447

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

Open
jmpesp wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bump crucible and propolis revs to latest #10447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99583a2
Bump crucible and propolis revs to latest
jmpesp May 14, 2026
939b8fc
doctest fix
jmpesp May 14, 2026
e75638f
fix rust-cache macos runner bug
jmpesp May 14, 2026
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
392 changes: 118 additions & 274 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 15 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,10 +473,11 @@ crossterm = { version = "0.29.0", features = ["event-stream"] }
# NOTE: if you change the pinned revision of the `crucible` dependencies, you
# must also update the references in package-manifest.toml to match the new
# revision.
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "bd9a0e2abe6b6b89aec8c85f4ee57474144ed150" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "bd9a0e2abe6b6b89aec8c85f4ee57474144ed150" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "bd9a0e2abe6b6b89aec8c85f4ee57474144ed150" }
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "bd9a0e2abe6b6b89aec8c85f4ee57474144ed150" }
crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "bd9a0e2abe6b6b89aec8c85f4ee57474144ed150" }
# NOTE: See above!
csv = "1.3.1"
curve25519-dalek = "4"
Expand Down Expand Up @@ -721,11 +722,11 @@ progenitor-client010 = { package = "progenitor-client", version = "0.10.0" }
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
# dependencies, you must also update the references in package-manifest.toml to
# match the new revision.
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "bc489ddf0f38f75e0c194b86cf6f0de377f68845" }
propolis-api-types-versions = { git = "https://github.com/oxidecomputer/propolis", rev = "bc489ddf0f38f75e0c194b86cf6f0de377f68845" }
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "bc489ddf0f38f75e0c194b86cf6f0de377f68845" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "bc489ddf0f38f75e0c194b86cf6f0de377f68845" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "bc489ddf0f38f75e0c194b86cf6f0de377f68845" }
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "58ab73bde89ade637b0ca8118682ee9575da6c2a" }
propolis-api-types-versions = { git = "https://github.com/oxidecomputer/propolis", rev = "58ab73bde89ade637b0ca8118682ee9575da6c2a" }
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "58ab73bde89ade637b0ca8118682ee9575da6c2a" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "58ab73bde89ade637b0ca8118682ee9575da6c2a" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "58ab73bde89ade637b0ca8118682ee9575da6c2a" }
# NOTE: see above!
proptest = "1.7.0"
qorb = "0.4.1"
Expand All @@ -751,7 +752,6 @@ regress = "0.10.4"
repo-depot-api = { path = "sled-agent/repo-depot-api" }
repo-depot-client = { path = "clients/repo-depot-client" }
reqwest = { version = "0.13", default-features = false }
reqwest012 = { package = "reqwest", version = "0.12", default-features = false }
ring = "0.17.14"
rpassword = "7.4.0"
rstest = "0.25.0"
Expand Down Expand Up @@ -1074,11 +1074,16 @@ opt-level = 3
# crucible-agent-client = { path = "../crucible/agent-client" }
# crucible-pantry-client = { path = "../crucible/pantry-client" }
# crucible-smf = { path = "../crucible/smf" }
# crucible-common = { path = "../crucible/common" }
# crucible-client-types = { path = "../crucible/crucible-client-types" }

# [patch."https://github.com/oxidecomputer/diesel-dtrace"]
# diesel-dtrace = { path = "../diesel-dtrace" }

# [patch."https://github.com/oxidecomputer/propolis"]
# bhyve_api = { path = "../propolis/crates/bhyve-api" }
# propolis-api-types-versions = { path = "../propolis/crates/propolis-api-types-versions" }
# propolis_api_types = { path = "../propolis/crates/propolis-api-types" }
# propolis-client = { path = "../propolis/lib/propolis-client" }
# propolis-mock-server = { path = "../propolis/bin/mock-server" }

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/omdb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ nexus-reconfigurator-preparation.workspace = true
nexus-saga-recovery.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
omicron-nexus.workspace = true
omicron-uuid-kinds.workspace = true
omicron-workspace-hack.workspace = true
owo-colors.workspace = true
Expand Down Expand Up @@ -101,7 +102,6 @@ expectorate.workspace = true
http.workspace = true
nexus-test-utils.workspace = true
nexus-test-utils-macros.workspace = true
omicron-nexus.workspace = true
omicron-test-utils.workspace = true
subprocess.workspace = true

Expand Down
22 changes: 20 additions & 2 deletions dev-tools/omdb/src/bin/omdb/crucible_pantry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use clap::Args;
use clap::Subcommand;
use crucible_pantry_client::Client;
use crucible_pantry_client::types::VolumeStatus;
use omicron_nexus::app::crucible::VolumeHealth;
use tabled::Tabled;
use uuid::Uuid;

Expand Down Expand Up @@ -101,12 +102,29 @@ async fn cmd_volume_info(
args: &VolumeArgs,
) -> Result<(), anyhow::Error> {
let volume = args.uuid.to_string();
let VolumeStatus { active, num_job_handles, seen_active } =
*client.volume_status(&volume).await.context("listing volumes")?;

let VolumeStatus { active, num_job_handles, seen_active, info } = client
.volume_status(&volume)
.await
.context("listing volumes")?
.into_inner();

println!(" active: {}", active);
println!(" num_job_handles: {}", num_job_handles);
println!(" seen_active: {}", seen_active);

use omicron_nexus::app::crucible::crucible_pantry_client_volume_health;

match crucible_pantry_client_volume_health(&info) {
VolumeHealth::Healthy => {
println!(" volume health: healthy");
}

VolumeHealth::Degraded { reason } => {
println!(" volume health: degraded ({reason})");
}
}

Ok(())
}

Expand Down
1 change: 0 additions & 1 deletion nexus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ ref-cast.workspace = true
rdb-types.workspace = true
regex.workspace = true
reqwest = { workspace = true, features = ["http2", "json"] }
reqwest012 = { workspace = true }
ring.workspace = true
samael.workspace = true
schemars = { workspace = true, features = ["chrono", "uuid1"] }
Expand Down
Loading
Loading