Skip to content

Commit 2d1fa18

Browse files
author
Alan Hanson
committed
Update Propolis and Crucible to latest
Crucible changes: Per client, queue-based backpressure (#1186) A builder for the Downstairs Downstairs struct. (#1152) Update Rust to v1.76.0 (#1153) Deactivate the read only parent after a scrub (#1180) Start byte-based backpressure earlier (#1179) Tweak CI scripts to fix warnings (#1178) Make `gw_ds_complete` less public (#1175) Verify extent under repair is valid after copying files (#1159) Remove individual panic setup, use global panic settings (#1174) [smf] Use new zone network config service (#1096) Move a few methods into downstairs (#1160) Remove extra clone in upstairs read (#1163) Make `crucible-downstairs` not depend on upstairs (#1165) Update Rust crate rusqlite to 0.31 (#1171) Update Rust crate reedline to 0.29.0 (#1170) Update Rust crate clap to 4.5 (#1169) Update Rust crate indicatif to 0.17.8 (#1168) Update progenitor to bc0bb4b (#1164) Do not 500 on snapshot delete for deleted region (#1162) Drop jobs from Offline downstairs. (#1157) `Mutex<Work>` → `Work` (#1156) Added a contributing.md (#1158) Remove ExtentFlushClose::source_downstairs (#1154) Remove unnecessary mutexes from Downstairs (#1132) Propolis changes: PHD: improve Windows reliability (#651) Update progenitor and omicron deps Clean up VMM resource on server shutdown Remove Inventory mechanism Update vergen dependency Properly handle pre/post illumos#16183 fixups PHD: add `pfexec` to xtask phd-runner invocation (#647) PHD: add Windows Server 2016 adapter & improve WS2016/2019 reliability (#646) PHD: use `clap` for more `cargo xtask phd` args (#645) PHD: several `cargo xtask phd` CLI fixes (#642) PHD: Use ZFS clones for file-backed disks (#640) PHD: improve ctrl-c handling (#634)
1 parent dcd3d9e commit 2d1fa18

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

Cargo.lock

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

Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ cookie = "0.18"
182182
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
183183
crossbeam = "0.8"
184184
crossterm = { version = "0.27.0", features = ["event-stream"] }
185-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "796dce526dd7ed7b52a0429a486ccba4a9da1ce5" }
186-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "796dce526dd7ed7b52a0429a486ccba4a9da1ce5" }
187-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "796dce526dd7ed7b52a0429a486ccba4a9da1ce5" }
185+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "1c1574fb721f98f2df1b23e3fd27d83be018882e" }
186+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "1c1574fb721f98f2df1b23e3fd27d83be018882e" }
187+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "1c1574fb721f98f2df1b23e3fd27d83be018882e" }
188188
csv = "1.3.0"
189189
curve25519-dalek = "4"
190190
datatest-stable = "0.2.3"
@@ -314,9 +314,9 @@ prettyplease = { version = "0.2.16", features = ["verbatim"] }
314314
proc-macro2 = "1.0"
315315
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
316316
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
317-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "488a70c644e332dae98447292a95e45074c8107c" }
318-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "488a70c644e332dae98447292a95e45074c8107c" }
319-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "488a70c644e332dae98447292a95e45074c8107c" }
317+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "a9fdbc464db4cbd4ac0f43ffa0d045b4b02e0c1c" }
318+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "a9fdbc464db4cbd4ac0f43ffa0d045b4b02e0c1c" }
319+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "a9fdbc464db4cbd4ac0f43ffa0d045b4b02e0c1c" }
320320
proptest = "1.4.0"
321321
quote = "1.0"
322322
rand = "0.8.5"

package-manifest.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,10 @@ only_for_targets.image = "standard"
441441
# 3. Use source.type = "manual" instead of "prebuilt"
442442
source.type = "prebuilt"
443443
source.repo = "crucible"
444-
source.commit = "fe0c5c7909707a0f826025be4fe2bbf5f6e0206f"
444+
source.commit = "1c1574fb721f98f2df1b23e3fd27d83be018882e"
445445
# The SHA256 digest is automatically posted to:
446446
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
447-
source.sha256 = "5da4f93b16fc7c0f3cc3a67919dbaa3f143cc07b703183a236f5c98b61504d15"
447+
source.sha256 = "a14ce9d6b17c6c8427d526e044bb1196ee81316674936873ac9dc1d7ca51459d"
448448
output.type = "zone"
449449
output.intermediate_only = true
450450

@@ -453,10 +453,10 @@ service_name = "crucible_pantry_prebuilt"
453453
only_for_targets.image = "standard"
454454
source.type = "prebuilt"
455455
source.repo = "crucible"
456-
source.commit = "fe0c5c7909707a0f826025be4fe2bbf5f6e0206f"
456+
source.commit = "1c1574fb721f98f2df1b23e3fd27d83be018882e"
457457
# The SHA256 digest is automatically posted to:
458458
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
459-
source.sha256 = "ed5027cc37c5ba4f2b9a568528f5bb49deedccaaa60bd770311c7bface6aa02b"
459+
source.sha256 = "8839a3748cd2926f61244c99344d0802e59ea4673a5f31a2aaad5d759176aa80"
460460
output.type = "zone"
461461
output.intermediate_only = true
462462

@@ -468,10 +468,10 @@ service_name = "propolis-server"
468468
only_for_targets.image = "standard"
469469
source.type = "prebuilt"
470470
source.repo = "propolis"
471-
source.commit = "c7cdaf1875d259e29ca50a14b77b0bfd9dfe443d"
471+
source.commit = "a9fdbc464db4cbd4ac0f43ffa0d045b4b02e0c1c"
472472
# The SHA256 digest is automatically posted to:
473473
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
474-
source.sha256 = "0203b7f702377c877c4132851ca102d68cd8fd2c20e4fd5b59d950cbb07fd9ff"
474+
source.sha256 = "7998a71c4e905a4bf9ef2d2863b7695d0bb4d1b34322aa3ce20d173d4a7ee77a"
475475
output.type = "zone"
476476

477477
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)