Skip to content

Commit 5fa0d8e

Browse files
leftwoAlan Hanson
andauthored
Update Propolis and Crucible (#7421)
Crucible changes are: Add early rejection of IOs if too many Downstairs are inactive (#1565) Fix missing write stats in Oximeter. (#1617) Shrink replay buffer (#1616) Update tokio to 1.40 (#1611) Propolis changes are: crates: move host CPUID queries from cpuid-gen to cpuid-utils (#843) --------- Co-authored-by: Alan Hanson <alan@oxide.computer>
1 parent 7f05fce commit 5fa0d8e

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

Cargo.lock

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,10 @@ crossterm = { version = "0.28.1", features = ["event-stream"] }
358358
# NOTE: if you change the pinned revision of the `crucible` dependencies, you
359359
# must also update the references in package-manifest.toml to match the new
360360
# revision.
361-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "ace54d9cb5957fda79422e8237d7c54c33af928e" }
362-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "ace54d9cb5957fda79422e8237d7c54c33af928e" }
363-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "ace54d9cb5957fda79422e8237d7c54c33af928e" }
364-
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "ace54d9cb5957fda79422e8237d7c54c33af928e" }
361+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "86a2ce1f9f13912a5fe652472de765ec5fc22e76" }
362+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "86a2ce1f9f13912a5fe652472de765ec5fc22e76" }
363+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "86a2ce1f9f13912a5fe652472de765ec5fc22e76" }
364+
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "86a2ce1f9f13912a5fe652472de765ec5fc22e76" }
365365
# NOTE: See above!
366366
csv = "1.3.1"
367367
curve25519-dalek = "4"
@@ -559,10 +559,10 @@ progenitor-client = "0.9.1"
559559
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
560560
# dependencies, you must also update the references in package-manifest.toml to
561561
# match the new revision.
562-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "e9db2377f4300a7539ebb3e4237e06d46ec1e6cc" }
563-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "e9db2377f4300a7539ebb3e4237e06d46ec1e6cc" }
564-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "e9db2377f4300a7539ebb3e4237e06d46ec1e6cc" }
565-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "e9db2377f4300a7539ebb3e4237e06d46ec1e6cc" }
562+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "99251f841debbe9aaceb4a407a984190c63dead5" }
563+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "99251f841debbe9aaceb4a407a984190c63dead5" }
564+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "99251f841debbe9aaceb4a407a984190c63dead5" }
565+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "99251f841debbe9aaceb4a407a984190c63dead5" }
566566
# NOTE: see above!
567567
proptest = "1.5.0"
568568
qorb = "0.2.1"

package-manifest.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -581,10 +581,10 @@ only_for_targets.image = "standard"
581581
# 3. Use source.type = "manual" instead of "prebuilt"
582582
source.type = "prebuilt"
583583
source.repo = "crucible"
584-
source.commit = "ace54d9cb5957fda79422e8237d7c54c33af928e"
584+
source.commit = "86a2ce1f9f13912a5fe652472de765ec5fc22e76"
585585
# The SHA256 digest is automatically posted to:
586586
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
587-
source.sha256 = "6f25aa712542b8ba13cca1b969eeb2935b37e3337f022396b344a6cc83ff0d39"
587+
source.sha256 = "ff41d5fb504982536445c34fb62ddccc78d40d5806326fe0d01094f4dc4ba58f"
588588
output.type = "zone"
589589
output.intermediate_only = true
590590

@@ -593,10 +593,10 @@ service_name = "crucible_pantry_prebuilt"
593593
only_for_targets.image = "standard"
594594
source.type = "prebuilt"
595595
source.repo = "crucible"
596-
source.commit = "ace54d9cb5957fda79422e8237d7c54c33af928e"
596+
source.commit = "86a2ce1f9f13912a5fe652472de765ec5fc22e76"
597597
# The SHA256 digest is automatically posted to:
598598
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
599-
source.sha256 = "92a40c04247679a32858a07578669690ab961a1d7e7bda92de5571e576a230fe"
599+
source.sha256 = "70b9423e0851afe9411957cd5ac515add0cd52dbe98a50f31c8c85ac7a43299c"
600600
output.type = "zone"
601601
output.intermediate_only = true
602602

@@ -610,10 +610,10 @@ service_name = "crucible_dtrace"
610610
only_for_targets.image = "standard"
611611
source.type = "prebuilt"
612612
source.repo = "crucible"
613-
source.commit = "ace54d9cb5957fda79422e8237d7c54c33af928e"
613+
source.commit = "86a2ce1f9f13912a5fe652472de765ec5fc22e76"
614614
# The SHA256 digest is automatically posted to:
615615
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-dtrace.sha256.txt
616-
source.sha256 = "895544df19ef1df7ef1750e978c20e70cdba1bc1dc93db392798284b4ce9b55a"
616+
source.sha256 = "580e0ccb93c24835ada62b40a054042ab301fce3e1c26cd6b29611a60829f545"
617617
output.type = "tarball"
618618

619619
# Refer to
@@ -624,10 +624,10 @@ service_name = "propolis-server"
624624
only_for_targets.image = "standard"
625625
source.type = "prebuilt"
626626
source.repo = "propolis"
627-
source.commit = "e9db2377f4300a7539ebb3e4237e06d46ec1e6cc"
627+
source.commit = "99251f841debbe9aaceb4a407a984190c63dead5"
628628
# The SHA256 digest is automatically posted to:
629629
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
630-
source.sha256 = "819d4ff2a165197be8384f693f5a09d7f12a0718647a0f3235910bb980ce0d52"
630+
source.sha256 = "53721913ee25b2c649cd845c542fb1ebf86d3e61c68af4002fcfad60050c9e54"
631631
output.type = "zone"
632632

633633
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)