From c454ad8c94383af37db2fb726388498a2555d1c6 Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Thu, 19 Nov 2026 21:09:31 +0000 Subject: [PATCH] Update crucible version in propolis Here are all the things that changed: test_up.sh: wait for downstairs 2 to be running before repair part 2 (#2086) Log more about live-repair to help debug read mismatches (#2084) dsc: Only report a downstairs as Running once it is listening (#2085) Fix crutest replace workload to use new regions (#2078) crutest: use a new region when reusing a replaced downstairs (#2074) dsc: Add a command to recreate a region in place (#2073) Update progenitor to 0.16.0 (#2080) Skip held jobs when live-repair start faults an offline client (#2057) Add diagnostic context to write hash validation failures (#2081) dsc: Don't delay actions while a downstairs is stopped (#2076) Flip the V14 switch. (#2070) When appropriate, the Upstairs will send YouHaveBeenActive (#2068) Upstairs asks for BeenActive (#2052) downstairs: new negotiation steps for BeenActive (#2050) update buildomat jobs to use helios 3 (#2069) More downstairs support for remembering active state (#2049) Polish Downstairs /work diagnostics (#2055) downstairs: allow capping the negotiated message version (#2048) protocol: negotiate the message version from a supported set (#2047) Plumbing for a downstairs to track if it has been active. (#2046) [meta] update openapi-lint (#2064) dsc: return a struct from dsc_get_pid rather than a nullable body (#2063) reject requests for API versions older than the oldest supported one (#2061) Update actions/checkout digest to d23441a (#2054) Avoid empty dependency lists in live repair logs (#2053) Update Rust crate reedline to 0.52.1 (#2031) Update Rust crate rusqlite to 0.40 (#1885) Update Rust crate crossterm to 0.29.0 (#1702) Update Rust crate tokio-rustls to 0.26.6 (#1677) Add new been active messages for v14 (#2044) Update Rust to v1.99.1 (#1848) update rust-version and toolchain (#1966) protocol: pin the wire tag for Message variants, remove Unknown (#2043) Update Rust crate tracing-subscriber to 0.3.23 (#1874) Update Rust crate tempfile to v3.27.0 (#2034) Update Rust crate uuid to v1.28.0 (#2036) Update Rust crate subprocess to 1.2.1 (#2033) Update Rust crate expectorate to 1.3.0 (#2019) Update Rust crate toml to v1.1.8 (#2011) Update Rust crate omicron-zone-package to 0.12.3 (#2004) replace `atty` with `std::io::IsTerminal` (#2040) Update Rust crate async-trait to 0.1.92 (#1993) Update Rust crate tokio to v1.53.2 (#2035) Update Rust crate futures to v0.3.34 (#1999) Update Rust crate serde to v1.0.229 (#2006) Update Rust crate thiserror to v2.0.21 (#2009) Update Rust crate twox-hash to 2.1.5 (#2012) Update Rust crate async-recursion to 1.2.0 (#2015) Update Rust crate clap to v4.6.7 (#2018) Update Rust crate itertools to 0.15.0 (#2024) Update Rust crate num-derive to 0.5 (#2025) Update Rust crate proptest to 1.11.0 (#2027) Update Rust crate sha2 to 0.11 (#2032) Update Rust crate clearscreen to v5 (#2037) Update progenitor to 0.15.1 (#1991) Update Rust crate ratatui to 0.30 (#2029) Update Rust crate nix to v0.31.3 (#2003) Update Rust crate http to 1.5.0 (#2021) Update Rust crate humantime to 2.4.0 (#2022) Update Rust crate opentelemetry to 0.33.0 (#2026) Update Rust crate rangemap to 1.8.0 (#2028) Update Rust crate serde_json to v1.0.151 (#2007) Update Rust crate signal-hook to 0.4.5 (#2008) Update Rust crate tokio-util to v0.7.20 (#2010) Update dropshot-api-manager to 0.8.0 (#2013) Update Rust crate rayon to 1.12.0 (#2030) Update Rust crate bytes to v1.12.1 (#2017) Update Rust crate hyper to v1.12.0 (#2023) Update Rust crate fakedata_generator to 0.8 (#2020) Update Rust crate indicatif to 0.18.6 (#2001) Update Rust crate futures-core to v0.3.34 (#2000) Update Rust crate clearscreen to 4.0.6 (#1998) Update Rust crate chrono to v0.4.45 (#1997) Update Rust crate cfg-if to v1.0.5 (#1996) Update Rust crate camino to v1.2.6 (#1995) Update Rust crate base64 to 0.23.1 (#2016) Update Rust crate byte-unit to 5.2.6 (#1994) Update Rust crate anyhow to v1.0.104 (#1992) Make crucible-downstairs dump tolerant of MissingContextSlot errors (#1905) --- Cargo.lock | 110 ++++++++++++++++++++++++----------------------------- Cargo.toml | 6 +-- 2 files changed, 52 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fb49b0633..c794211eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -226,13 +226,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +checksum = "4f8abc12baad266b1c8cec146854c195b5864b4221d4b2ca7296a7ae82d9e451" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 3.0.9", ] [[package]] @@ -259,13 +259,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.89" +version = "0.1.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 3.0.9", ] [[package]] @@ -304,17 +304,6 @@ dependencies = [ "thiserror 2.0.18", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.3.0" @@ -1318,28 +1307,28 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crucible" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002#bd62980710dd3d6d3524aa7f6617127942b75002" +source = "git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9#ab60c84355b9f2a8f83f3938d9395e636421a1f9" dependencies = [ "aes-gcm-siv", "anyhow", "async-recursion", "async-trait", - "base64 0.22.1", + "base64 0.23.1", "bincode", "bytes", "cfg-if", "chrono", - "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002)", + "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9)", "crucible-common", "crucible-protocol", "crucible-workspace-hack", - "dropshot 0.17.1", + "dropshot 0.18.0", "fakedata_generator", "futures", "futures-core", "internal-dns-resolver", "internal-dns-types", - "itertools 0.14.0", + "itertools 0.15.0", "libc", "nexus-client", "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?rev=5fd53a9c9ff2b0e47bfef3fe842b7516877b0162)", @@ -1361,7 +1350,7 @@ dependencies = [ "slog-term", "strum 0.27.2", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls 0.26.6", "tokio-util", "toml 1.1.2+spec-1.1.0", "tracing", @@ -1386,9 +1375,9 @@ dependencies = [ [[package]] name = "crucible-client-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002#bd62980710dd3d6d3524aa7f6617127942b75002" +source = "git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9#ab60c84355b9f2a8f83f3938d9395e636421a1f9" dependencies = [ - "base64 0.22.1", + "base64 0.23.1", "crucible-workspace-hack", "schemars 0.8.22", "serde", @@ -1412,12 +1401,11 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002#bd62980710dd3d6d3524aa7f6617127942b75002" +source = "git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9#ab60c84355b9f2a8f83f3938d9395e636421a1f9" dependencies = [ "anyhow", - "atty", "crucible-workspace-hack", - "dropshot 0.17.1", + "dropshot 0.18.0", "nix 0.31.3", "rustls-pemfile", "schemars 0.8.22", @@ -1431,7 +1419,7 @@ dependencies = [ "tempfile", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls 0.26.6", "toml 1.1.2+spec-1.1.0", "twox-hash", "uuid", @@ -1442,7 +1430,7 @@ dependencies = [ [[package]] name = "crucible-protocol" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002#bd62980710dd3d6d3524aa7f6617127942b75002" +source = "git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9#ab60c84355b9f2a8f83f3938d9395e636421a1f9" dependencies = [ "anyhow", "bincode", @@ -2157,7 +2145,7 @@ dependencies = [ "slog-term", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls 0.26.6", "tokio-util", "toml 1.1.2+spec-1.1.0", "usdt 0.6.0", @@ -2209,7 +2197,7 @@ dependencies = [ "slog-term", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls 0.26.6", "tokio-util", "toml 1.1.2+spec-1.1.0", "usdt 0.6.0", @@ -2561,9 +2549,9 @@ dependencies = [ [[package]] name = "fakedata_generator" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42ec18312c068f0d6008ad66ad2fa289ab40a16d07a06406c200baa09eb1e7c" +checksum = "510bf1fc5a6d8b13cf9cbcb682991702ba896f91345179a2b931ae6760825d3a" dependencies = [ "passt", "rand 0.9.2", @@ -3253,15 +3241,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.9" @@ -3527,7 +3506,7 @@ dependencies = [ "rustls 0.23.41", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls 0.26.6", "tower-service", "webpki-roots 0.26.3", ] @@ -4079,7 +4058,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", "windows-sys 0.52.0", ] @@ -4131,6 +4110,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -6864,7 +6852,7 @@ dependencies = [ "cpuid_utils", "crossbeam-channel", "crucible", - "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002)", + "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9)", "dice-verifier", "dladm", "dlpi 0.2.0 (git+https://github.com/oxidecomputer/dlpi-sys?branch=main)", @@ -6914,7 +6902,7 @@ dependencies = [ name = "propolis-api-types-versions" version = "0.0.0" dependencies = [ - "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002)", + "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9)", "propolis_types 0.0.0", "schemars 0.8.22", "serde", @@ -6943,7 +6931,7 @@ dependencies = [ "anyhow", "base64 0.21.7", "clap", - "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002)", + "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9)", "futures", "libc", "newtype-uuid", @@ -6966,7 +6954,7 @@ version = "0.1.0" dependencies = [ "async-trait", "base64 0.21.7", - "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002)", + "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9)", "futures", "progenitor 0.15.1", "progenitor-client 0.15.1", @@ -7090,7 +7078,7 @@ dependencies = [ "clap", "const_format", "cpuid_utils", - "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002)", + "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9)", "dropshot 0.18.0", "erased-serde 0.4.5", "expectorate", @@ -7146,7 +7134,7 @@ dependencies = [ name = "propolis-server-api" version = "0.1.0" dependencies = [ - "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002)", + "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9)", "dropshot 0.18.0", "dropshot-api-manager-types", "propolis-api-types-versions 0.0.0", @@ -7161,7 +7149,7 @@ dependencies = [ "clap", "cpuid_profile_config", "cpuid_utils", - "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002)", + "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9)", "ctrlc", "erased-serde 0.4.5", "fatfs", @@ -7204,7 +7192,7 @@ dependencies = [ name = "propolis_api_types" version = "0.0.0" dependencies = [ - "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002)", + "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=ab60c84355b9f2a8f83f3938d9395e636421a1f9)", "propolis-api-types-versions 0.0.0", ] @@ -7492,9 +7480,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" dependencies = [ "either", "rayon-core", @@ -7680,7 +7668,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls 0.26.6", "tokio-util", "tower", "tower-http", @@ -7726,7 +7714,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls 0.26.6", "tokio-util", "tower", "tower-http", @@ -9698,9 +9686,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db" dependencies = [ "rustls 0.23.41", "tokio", @@ -10202,9 +10190,9 @@ dependencies = [ [[package]] name = "twox-hash" -version = "2.1.2" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" +checksum = "86a801b3cea342a06d468c8710662aa29e5e05e4f5c0d62f00bbb7f2ad7941c2" dependencies = [ "rand 0.9.2", ] diff --git a/Cargo.toml b/Cargo.toml index be052d5a5..41471f9f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -92,8 +92,8 @@ oximeter = { git = "https://github.com/oxidecomputer/omicron", rev = "5fd53a9c9f sled-agent-client = { git = "https://github.com/oxidecomputer/omicron", rev = "5fd53a9c9ff2b0e47bfef3fe842b7516877b0162" } # Crucible -crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "bd62980710dd3d6d3524aa7f6617127942b75002" } -crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "bd62980710dd3d6d3524aa7f6617127942b75002" } +crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "ab60c84355b9f2a8f83f3938d9395e636421a1f9" } +crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "ab60c84355b9f2a8f83f3938d9395e636421a1f9" } # Attestation dice-verifier = { git = "https://github.com/oxidecomputer/dice-util", rev = "d7472bfa91aee859c3fe0bdc1dbb1e320285228e", features = ["sled-agent"] } @@ -102,7 +102,7 @@ vm-attest = { git = "https://github.com/oxidecomputer/vm-attest", rev = "deaf020 # External dependencies acpi_tables = { git = 'https://github.com/oxidecomputer/acpi_tables.git', tag = "v0.2.1-oxide.1" } anyhow = "1.0" -async-trait = "0.1.88" +async-trait = "0.1.92" backoff = "0.4.0" backtrace = "0.3.66" base64 = "0.21"