Skip to content

Commit 1d02ed3

Browse files
leftwoAlan Hanson
andauthored
Update Crucible/Propolis, change gen -> generation (#9387)
Update Propolis and Crucible Crucible changes are: Print file name for extents (#1811) Add threads argument to `crucible-downstairs verify` (#1807) Add `--verbose` option to `crucible-verify-raw` (#1806) Restore `--gen` argument for binaries (#1805) Bump to 2024 edition (#1799) Perform reconciliation if all three downstairs are in live-repair (#1784) Rename crucible-dtrace -> crucible-utils (#1803) Add `crucible-verify-raw` and `crucible-raw-extent packages` (#1800) Added extent-info to dump out region/extent/block specific offsets (#1797) Propolis changes are: Rework resource accessors to alleviate lock contention Implement NVMe Doorbell Buffer feature Overhaul block attachment and request dispatch propolis-cli should be able to send TOML-defined CPU profiles (#943) nvme: CQEs with command-specific error 0 are acceptable (#965) I also changed a bunch of `gen` -> `generation` as that is now what Crucible has. --------- Co-authored-by: Alan Hanson <alan@oxide.computer>
1 parent 4d65868 commit 1d02ed3

18 files changed

+189
-102
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
@@ -416,10 +416,10 @@ crossterm = { version = "0.29.0", features = ["event-stream"] }
416416
# NOTE: if you change the pinned revision of the `crucible` dependencies, you
417417
# must also update the references in package-manifest.toml to match the new
418418
# revision.
419-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
420-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
421-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
422-
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
419+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
420+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
421+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
422+
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
423423
# NOTE: See above!
424424
csv = "1.3.1"
425425
curve25519-dalek = "4"
@@ -648,10 +648,10 @@ progenitor-client = "0.10.0"
648648
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
649649
# dependencies, you must also update the references in package-manifest.toml to
650650
# match the new revision.
651-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "aaa51291b747928a1d69e4b6059a54163d4d2e6d" }
652-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "aaa51291b747928a1d69e4b6059a54163d4d2e6d" }
653-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "aaa51291b747928a1d69e4b6059a54163d4d2e6d" }
654-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "aaa51291b747928a1d69e4b6059a54163d4d2e6d" }
651+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "3f1752e6cee9a2f8ecdce6e2ad3326781182e2d9" }
652+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "3f1752e6cee9a2f8ecdce6e2ad3326781182e2d9" }
653+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "3f1752e6cee9a2f8ecdce6e2ad3326781182e2d9" }
654+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "3f1752e6cee9a2f8ecdce6e2ad3326781182e2d9" }
655655
# NOTE: see above!
656656
proptest = "1.7.0"
657657
qorb = "0.4.1"

dev-tools/omdb/src/bin/omdb/db.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2999,7 +2999,7 @@ fn print_vcr(vcr: VolumeConstructionRequest, pad: usize) {
29992999
bs: String,
30003000
bpe: u64,
30013001
ec: u32,
3002-
gen: u64,
3002+
generation: u64,
30033003
read_only: bool,
30043004
}
30053005

@@ -3045,15 +3045,15 @@ fn print_vcr(vcr: VolumeConstructionRequest, pad: usize) {
30453045
block_size,
30463046
blocks_per_extent,
30473047
extent_count,
3048-
gen,
3048+
generation,
30493049
opts,
30503050
} => {
30513051
let row = VCRRegion {
30523052
id: opts.id.to_string(),
30533053
bs: block_size.to_string(),
30543054
bpe: blocks_per_extent,
30553055
ec: extent_count,
3056-
gen,
3056+
generation,
30573057
read_only: opts.read_only,
30583058
};
30593059
let table = tabled::Table::new(&[row])

dev-tools/releng/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const HOST_IMAGE_PACKAGES: [(&PackageName, InstallMethod); 8] = [
6868
(&PackageName::new_const("oxlog"), InstallMethod::Install),
6969
(&PackageName::new_const("propolis-server"), InstallMethod::Bundle),
7070
(&PackageName::new_const("pumpkind-gz"), InstallMethod::Install),
71-
(&PackageName::new_const("crucible-dtrace"), InstallMethod::Install),
71+
(&PackageName::new_const("crucible-utils"), InstallMethod::Install),
7272
(&PackageName::new_const("switch-asic"), InstallMethod::Bundle),
7373
];
7474
/// Packages to install or bundle in the recovery (trampoline) OS image.

0 commit comments

Comments
 (0)