Skip to content

Commit

Permalink
Update crucible and propolis (#5673)
Browse files Browse the repository at this point in the history
Propolis:
Update oximeter dependency to pull in automatic producer registration (#689)
Propagate ReplaceResult up; return disk status (#687)
Enable clippy warnings for lossless casts
Update rustls deps for CVE-2024-32650
migration: refrain from offering all pages when possible (#682)

Crucible:
DTrace probes for IO on/off the network (#1284)
Update oximeter dep to pull in automatic producer registration (#1279)
Remove `ReadResponse` in favor of `RawReadResponse` (#1212)
Fix typo in DTrace upstairs_info (#1276)
replace needing no work should not be an error (#1275)
Add some DTrace scripts to the package. (#1274)
More Pantry updates for Region replacement (#1269)
Send the correct task count for reconciliations (#1271)
Raw extent cleanup (#1268)

---------

Co-authored-by: Alan Hanson <alan@oxide.computer>
  • Loading branch information
leftwo and Alan Hanson authored Apr 30, 2024
1 parent 69f22d0 commit fcf7980
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 31 deletions.
36 changes: 18 additions & 18 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ cookie = "0.18"
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
crossbeam = "0.8"
crossterm = { version = "0.27.0", features = ["event-stream"] }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "1ef72f3c935e7dc936bf43310c04668fb60d7a20" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "1ef72f3c935e7dc936bf43310c04668fb60d7a20" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "1ef72f3c935e7dc936bf43310c04668fb60d7a20" }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "62cc2cfe64ca09c6876be7633355026fa65c8545" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "62cc2cfe64ca09c6876be7633355026fa65c8545" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "62cc2cfe64ca09c6876be7633355026fa65c8545" }
csv = "1.3.0"
curve25519-dalek = "4"
datatest-stable = "0.2.9"
Expand Down Expand Up @@ -338,9 +338,9 @@ prettyplease = { version = "0.2.19", features = ["verbatim"] }
proc-macro2 = "1.0"
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "dd788a311a382b09ce1d3e35f7777b378e09fdf7" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "dd788a311a382b09ce1d3e35f7777b378e09fdf7" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "dd788a311a382b09ce1d3e35f7777b378e09fdf7" }
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "27e2789d381c0fcc237fbe30cec2ec66bd750c12" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "27e2789d381c0fcc237fbe30cec2ec66bd750c12" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "27e2789d381c0fcc237fbe30cec2ec66bd750c12" }
proptest = "1.4.0"
quote = "1.0"
rand = "0.8.5"
Expand Down
12 changes: 6 additions & 6 deletions package-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,10 @@ only_for_targets.image = "standard"
# 3. Use source.type = "manual" instead of "prebuilt"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "1ef72f3c935e7dc936bf43310c04668fb60d7a20"
source.commit = "62cc2cfe64ca09c6876be7633355026fa65c8545"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
source.sha256 = "f4b9189d82729f851bab25ee7991134db2732f82657a15e88889500ed8a6e6c2"
source.sha256 = "5b9e3ce16c8b3558e2ce20567165268088bd1b40a518636daf658eee28dd5843"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -502,10 +502,10 @@ service_name = "crucible_pantry_prebuilt"
only_for_targets.image = "standard"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "1ef72f3c935e7dc936bf43310c04668fb60d7a20"
source.commit = "62cc2cfe64ca09c6876be7633355026fa65c8545"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
source.sha256 = "e7bf9cf165c3191c899c1f019df4edb6a34c0fe83d61cce861ae0aefc649882d"
source.sha256 = "4aaff4a683d44f7c4d52a102a6c0592ff6135e5255f3a3317b1a38b962abd745"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -517,10 +517,10 @@ service_name = "propolis-server"
only_for_targets.image = "standard"
source.type = "prebuilt"
source.repo = "propolis"
source.commit = "dd788a311a382b09ce1d3e35f7777b378e09fdf7"
source.commit = "27e2789d381c0fcc237fbe30cec2ec66bd750c12"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
source.sha256 = "f9ebee502fdaa115563ac84e855805c0bf5582437820445dd1734423216dfc5b"
source.sha256 = "b6dd0188bd062a749fee2f2e39bcdb8e86bbbb3dd86fec463c140419736b0f86"
output.type = "zone"

[package.mg-ddm-gz]
Expand Down
2 changes: 1 addition & 1 deletion sled-agent/src/sim/http_entrypoints_pantry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ async fn scrub(
Ok(HttpResponseOk(ScrubResponse { job_id }))
}

/// Flush and close a volume, removing it from the Pantry
/// Deactivate a volume, removing it from the Pantry
#[endpoint {
method = DELETE,
path = "/crucible/pantry/0/volume/{id}",
Expand Down

0 comments on commit fcf7980

Please sign in to comment.