Skip to content

Commit d603774

Browse files
committed
Bump crucible and propolis revs to latest
Pick up the following propolis PRs: - Bump crucible rev to latest (oxidecomputer/propolis#922) - Added block_size for file backends in propolis_server (workers is optional) (oxidecomputer/propolis#917) Pick up the following crucible PRs: - Snapshots existing already are ok! (oxidecomputer/crucible#1759) - Less verbose logging (oxidecomputer/crucible#1756) - Remove unused `Vec<JoinHandle>` (oxidecomputer/crucible#1754) - Split "check reconciliation state" from "start reconciliation" (oxidecomputer/crucible#1732) - Improve `ClientIoTask` start logic (oxidecomputer/crucible#1731) - Use data-bearing enum variants pattern in negotiation (oxidecomputer/crucible#1727) - Make Downstairs stoppable (oxidecomputer/crucible#1730) - Don't log every region's metadata (oxidecomputer/crucible#1729) - Compute reconciliation from `ClientMap` instead of three clients (oxidecomputer/crucible#1726) - Make Offline -> Faulted transition happen without reconnecting (oxidecomputer/crucible#1725) - Remove `WaitActive` state during negotiation (oxidecomputer/crucible#1722) - Add explicit `UpstairsState::Disabled` (oxidecomputer/crucible#1721) - Print version on startup for pantry and agent (oxidecomputer/crucible#1723) - Update test mem to also show physical space used by regions. (oxidecomputer/crucible#1724) - Add AllStopped command and endpoint for downstairs status (oxidecomputer/crucible#1718) - Update tests to honor REGION_SETS env if provided. (oxidecomputer/crucible#1720) - Fix panic in `set_active_request` when client is in Stopping(Replacing) state (oxidecomputer/crucible#1717) - DTrace updates (oxidecomputer/crucible#1715)
1 parent 6ab7e96 commit d603774

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
@@ -405,10 +405,10 @@ crossterm = { version = "0.29.0", features = ["event-stream"] }
405405
# NOTE: if you change the pinned revision of the `crucible` dependencies, you
406406
# must also update the references in package-manifest.toml to match the new
407407
# revision.
408-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e164393a88e7b62598897dc4f53315f083e25333" }
409-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e164393a88e7b62598897dc4f53315f083e25333" }
410-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "e164393a88e7b62598897dc4f53315f083e25333" }
411-
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "e164393a88e7b62598897dc4f53315f083e25333" }
408+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "779775d5130ff7a4836f52f48b7e64d1479ee104" }
409+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "779775d5130ff7a4836f52f48b7e64d1479ee104" }
410+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "779775d5130ff7a4836f52f48b7e64d1479ee104" }
411+
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "779775d5130ff7a4836f52f48b7e64d1479ee104" }
412412
# NOTE: See above!
413413
csv = "1.3.1"
414414
curve25519-dalek = "4"
@@ -631,10 +631,10 @@ progenitor-client = "0.10.0"
631631
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
632632
# dependencies, you must also update the references in package-manifest.toml to
633633
# match the new revision.
634-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "c03bd1a29c775acfc65de561b8fc436e2459a633" }
635-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "c03bd1a29c775acfc65de561b8fc436e2459a633" }
636-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "c03bd1a29c775acfc65de561b8fc436e2459a633" }
637-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "c03bd1a29c775acfc65de561b8fc436e2459a633" }
634+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "23b06c2f452a97fac1dc12561d8451ce876d7c5a" }
635+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "23b06c2f452a97fac1dc12561d8451ce876d7c5a" }
636+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "23b06c2f452a97fac1dc12561d8451ce876d7c5a" }
637+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "23b06c2f452a97fac1dc12561d8451ce876d7c5a" }
638638
# NOTE: see above!
639639
proptest = "1.7.0"
640640
qorb = "0.4.0"

package-manifest.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,10 @@ only_for_targets.image = "standard"
594594
# 3. Use source.type = "manual" instead of "prebuilt"
595595
source.type = "prebuilt"
596596
source.repo = "crucible"
597-
source.commit = "e164393a88e7b62598897dc4f53315f083e25333"
597+
source.commit = "779775d5130ff7a4836f52f48b7e64d1479ee104"
598598
# The SHA256 digest is automatically posted to:
599599
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
600-
source.sha256 = "b24edb558348db08a0c012649fe1c3a4853ed4185b88cb3354905b6937acce20"
600+
source.sha256 = "1b393ceb5685700e26da0b6b71bcb869e7456bd33bbfdf4afe2ea5899e77a1fa"
601601
output.type = "zone"
602602
output.intermediate_only = true
603603

@@ -606,10 +606,10 @@ service_name = "crucible_pantry_prebuilt"
606606
only_for_targets.image = "standard"
607607
source.type = "prebuilt"
608608
source.repo = "crucible"
609-
source.commit = "e164393a88e7b62598897dc4f53315f083e25333"
609+
source.commit = "779775d5130ff7a4836f52f48b7e64d1479ee104"
610610
# The SHA256 digest is automatically posted to:
611611
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
612-
source.sha256 = "f768ffe134a1e2362a68730750649cbd42b4977cbd81ae364c24c7f7fcb7ce86"
612+
source.sha256 = "440da1e2c63c331bfa9e694bcc452c3bb55a915151eac022e7d810e99761aead"
613613
output.type = "zone"
614614
output.intermediate_only = true
615615

@@ -623,10 +623,10 @@ service_name = "crucible_dtrace"
623623
only_for_targets.image = "standard"
624624
source.type = "prebuilt"
625625
source.repo = "crucible"
626-
source.commit = "e164393a88e7b62598897dc4f53315f083e25333"
626+
source.commit = "779775d5130ff7a4836f52f48b7e64d1479ee104"
627627
# The SHA256 digest is automatically posted to:
628628
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-dtrace.sha256.txt
629-
source.sha256 = "4d572964c46185595c6027e091e5215a5eb012d5e322f2c70cac0abf88893465"
629+
source.sha256 = "a3d429399d30b2f26f8194ebfa47df1191c684c4cf8cfbb3be18fa79556d3d10"
630630
output.type = "tarball"
631631

632632
# Refer to
@@ -637,10 +637,10 @@ service_name = "propolis-server"
637637
only_for_targets.image = "standard"
638638
source.type = "prebuilt"
639639
source.repo = "propolis"
640-
source.commit = "c03bd1a29c775acfc65de561b8fc436e2459a633"
640+
source.commit = "23b06c2f452a97fac1dc12561d8451ce876d7c5a"
641641
# The SHA256 digest is automatically posted to:
642642
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
643-
source.sha256 = "a83979355bd5b7346c3647ad674c1da5a746d7045b992c1edcf8729cc7634e5d"
643+
source.sha256 = "ef5800987f38818f98942a1a6a3864858f81a258ca71cb5f908742a87d7a98e4"
644644
output.type = "zone"
645645

646646
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)