Skip to content

Commit b981fcb

Browse files
author
Alan Hanson
committed
Update Crucible and Propolis
Crucible changes Add test and fix for replay race condition (#1519) Fix clippy warnings (#1517) Add edition to `crucible-workspace-hack` (#1516) Split out Downstairs-specific stats (#1511) Move remaining `GuestWork` functionality into `Downstairs` (#1510) Track both jobs and bytes in each IO state (#1507) Fix new `rustc` and `clippy` warnings (#1509) Remove IOP/BW limits (for now) (#1506) Move `GuestBlockRes` into `DownstairsIO` (#1502) Update actions/checkout digest to eef6144 (#1499) Update Rust crate hyper-staticfile to 0.10.1 (#1411) Turn off test-up-2region-encrypted.sh (#1504) Add `IOop::Barrier` (#1494) Fix IPv6 addresses in `crutest` (#1503) Add region set options to more tests. (#1496) Simplify `CompleteJobs` (#1493) Removed ignored CI jobs (#1497) Minor cleanups to `print_last_completed` (#1501) Remove remaining `Arc<Volume>` instances (#1500) Add `VolumeBuilder` type (#1492) remove old unused scripts (#1495) More multiple region support. (#1484) Simplify matches (#1490) Move complete job tracker to a helper object (#1489) Expand summary and add documentation references to the README. (#1486) Remove `GuestWorkId` (2/2) (#1482) Remove `JobId` from `DownstairsIO` (1/2) (#1481) Remove unused `#[derive(..)]` (#1483) Update more tests to use dsc (#1480) Crutest now Volume only (#1479) Propolis changes manually impl Deserialize for PciPath for validation purposes (#801) phd: gate OS-specific tests, make others more OS-agnostic (#799) lib: log vCPU diagnostics on triple fault and for some unhandled exit types (#795) add marker trait to help check safety of guest memory reads (#794) clippy fixes for 1.82 (#796) lib: move cpuid::Set to cpuid_utils; prevent semantic subleaf conflicts (#782) PHD: write efivars in one go (#786) PHD: support guest-initiated reboot (#785) server: accept CPUID values in instance specs and plumb them to bhyve (#780) PHD: allow patched Crucible dependencies (#778) server: add a first-class error type to machine init (#777) PciPath to Bdf conversion is infallible; prove it and refactor (#774) instance spec rework: flatten InstanceSpecV0 (#767) Make PUT /instance/state 503 when waiting to init Less anxiety-inducing `Vm::{get, state_watcher}`
1 parent 78ee981 commit b981fcb

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

Cargo.lock

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

Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,10 @@ cookie = "0.18"
329329
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
330330
crossbeam = "0.8"
331331
crossterm = { version = "0.28.1", features = ["event-stream"] }
332-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "2b88ab88461fb06aaf2aab11c5e381a3cad25eac" }
333-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "2b88ab88461fb06aaf2aab11c5e381a3cad25eac" }
334-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "2b88ab88461fb06aaf2aab11c5e381a3cad25eac" }
335-
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "2b88ab88461fb06aaf2aab11c5e381a3cad25eac" }
332+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "b7b9d5660b28ca5e865242b2bdecd032c0852d40" }
333+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "b7b9d5660b28ca5e865242b2bdecd032c0852d40" }
334+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "b7b9d5660b28ca5e865242b2bdecd032c0852d40" }
335+
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "b7b9d5660b28ca5e865242b2bdecd032c0852d40" }
336336
csv = "1.3.0"
337337
curve25519-dalek = "4"
338338
datatest-stable = "0.2.9"
@@ -515,10 +515,10 @@ prettyplease = { version = "0.2.22", features = ["verbatim"] }
515515
proc-macro2 = "1.0"
516516
progenitor = "0.8.0"
517517
progenitor-client = "0.8.0"
518-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "11371b0f3743f8df5b047dc0edc2699f4bdf3927" }
519-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "11371b0f3743f8df5b047dc0edc2699f4bdf3927" }
520-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "11371b0f3743f8df5b047dc0edc2699f4bdf3927" }
521-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "11371b0f3743f8df5b047dc0edc2699f4bdf3927" }
518+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "b3d6c6c0f59c70c7e999456c17163518fe2440c8" }
519+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "b3d6c6c0f59c70c7e999456c17163518fe2440c8" }
520+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "b3d6c6c0f59c70c7e999456c17163518fe2440c8" }
521+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "b3d6c6c0f59c70c7e999456c17163518fe2440c8" }
522522
proptest = "1.5.0"
523523
qorb = "0.1.2"
524524
quote = "1.0"

package-manifest.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -576,10 +576,10 @@ only_for_targets.image = "standard"
576576
# 3. Use source.type = "manual" instead of "prebuilt"
577577
source.type = "prebuilt"
578578
source.repo = "crucible"
579-
source.commit = "2b88ab88461fb06aaf2aab11c5e381a3cad25eac"
579+
source.commit = "b7b9d5660b28ca5e865242b2bdecd032c0852d40"
580580
# The SHA256 digest is automatically posted to:
581581
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
582-
source.sha256 = "0927e7211f645ef8c3f715c7b6a8be81a0f4b6250a3ff352348ae701e89713f5"
582+
source.sha256 = "44e623730765f8fc0b702d107939552514530a33b306ca5e8bc8276ff0aaf79a"
583583
output.type = "zone"
584584
output.intermediate_only = true
585585

@@ -588,10 +588,10 @@ service_name = "crucible_pantry_prebuilt"
588588
only_for_targets.image = "standard"
589589
source.type = "prebuilt"
590590
source.repo = "crucible"
591-
source.commit = "2b88ab88461fb06aaf2aab11c5e381a3cad25eac"
591+
source.commit = "b7b9d5660b28ca5e865242b2bdecd032c0852d40"
592592
# The SHA256 digest is automatically posted to:
593593
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
594-
source.sha256 = "c273dd273cb09cbd8007925b41fcc6df9807dd93e395347b36ce8306a8dc93e4"
594+
source.sha256 = "bc0a41d349646ec2111bff346db2c300001d646a99f33b05b39b78188e34ae41"
595595
output.type = "zone"
596596
output.intermediate_only = true
597597

@@ -605,10 +605,10 @@ service_name = "crucible_dtrace"
605605
only_for_targets.image = "standard"
606606
source.type = "prebuilt"
607607
source.repo = "crucible"
608-
source.commit = "2b88ab88461fb06aaf2aab11c5e381a3cad25eac"
608+
source.commit = "b7b9d5660b28ca5e865242b2bdecd032c0852d40"
609609
# The SHA256 digest is automatically posted to:
610610
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-dtrace.sha256.txt
611-
source.sha256 = "972a713eb02bc1aeaa7b16db24fef7f82afcfc4546abe998792c85f4a48269c0"
611+
source.sha256 = "64e37f7a062f7c8941fac3b95a81d98475e5c02ff01111554b0ddb7fc232f40f"
612612
output.type = "tarball"
613613

614614
# Refer to
@@ -619,10 +619,10 @@ service_name = "propolis-server"
619619
only_for_targets.image = "standard"
620620
source.type = "prebuilt"
621621
source.repo = "propolis"
622-
source.commit = "11371b0f3743f8df5b047dc0edc2699f4bdf3927"
622+
source.commit = "b3d6c6c0f59c70c7e999456c17163518fe2440c8"
623623
# The SHA256 digest is automatically posted to:
624624
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
625-
source.sha256 = "07383cbad45bc032de1b65d3553839751fde96342cc76249ca4a45b89872aae9"
625+
source.sha256 = "27344f26ad545345a3edf8e8d44468040650377cde601190ea06e245736aa60e"
626626
output.type = "zone"
627627

628628
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)