Skip to content

Commit 803cb36

Browse files
leftwoAlan Hanson
and
Alan Hanson
authored
Update propolis with new Crucible Volume change (#485)
New crucible, which has updated Volume structure with Logger field. This also adds the crucible side support for the coming VCR replacement, which will be used to replace a downstairs as well as validate a VCR for migration. --------- Co-authored-by: Alan Hanson <[email protected]>
1 parent 556b6e3 commit 803cb36

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-3
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ chrono = "0.4.19"
9292
clap = "4.2"
9393
const_format = "0.2"
9494
crossbeam-channel = "0.5"
95-
crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "84507ed89aced20920de73342666a8abcb8237c1" }
96-
crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "84507ed89aced20920de73342666a8abcb8237c1" }
95+
crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "175a8cee9d08a3791a89a32a22844f04ad025c31" }
96+
crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "175a8cee9d08a3791a89a32a22844f04ad025c31" }
9797
ctrlc = "3.2"
9898
dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main" }
9999
enum-iterator = "1.4.1"
@@ -143,4 +143,3 @@ tracing-subscriber = "0.3.14"
143143
usdt = { version = "0.3.5", default-features = false }
144144
uuid = "1.3.2"
145145
vte = "0.10.1"
146-

lib/propolis/src/block/crucible.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ impl CrucibleBackend {
6262
) -> Result<Arc<Self>, crucible::CrucibleError> {
6363
// Construct the volume.
6464
let volume =
65-
Volume::construct(request, producer_registry, Some(log.clone()))
66-
.await?;
65+
Volume::construct(request, producer_registry, log.clone()).await?;
6766

6867
// Decide if we need to scrub this volume or not.
6968
if volume.has_read_only_parent() {
@@ -72,7 +71,7 @@ impl CrucibleBackend {
7271
let volume_id = vclone.get_uuid().await.unwrap();
7372

7473
// This does the actual scrub.
75-
match vclone.scrub(&log, Some(120), Some(25)).await {
74+
match vclone.scrub(Some(120), Some(25)).await {
7675
Ok(()) => {
7776
if let Some(nexus_client) = nexus_client {
7877
info!(

0 commit comments

Comments
 (0)