Merge branch 'nexus_generation' into dap/handoff-quiesce-1

Author: davepacheco

Cargo.lock

@@ -430,7 +430,7 @@ dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
 dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "6e666520620e26432333d9060bc7d249ba9fa92e" }
 dropshot = { version = "0.16.3", features = [ "usdt-probes" ] }
-dyn-clone = "1.0.19"
+dyn-clone = "1.0.20"
 either = "1.15.0"
 ereport-types = { path = "ereport/types" }
 expectorate = "1.2.0"
@@ -639,12 +639,12 @@ propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev
 proptest = "1.7.0"
 qorb = "0.4.1"
 quote = "1.0"
-rand = "0.8.5"
-# We're still in the middle of migrating to rand 0.9.
-rand09 = { package = "rand", version = "0.9.1" }
-rand_core = "0.6.4"
-rand_distr = "0.4.3"
-rand_seeder = "0.3.0"
+# Some dependencies still require rand 0.8.x.
+rand08 = { package = "rand", version = "0.8.5" }
+rand = "0.9.2"
+rand_core = "0.9.3"
+rand_distr = "0.5.1"
+rand_seeder = "0.4.0"
 range-requests = { path = "range-requests" }
 ratatui = "0.29.0"
 rayon = "1.10"

Cargo.toml

@@ -20,7 +20,8 @@ derive_more.workspace = true
 hex.workspace = true
 hkdf.workspace = true
 omicron-common.workspace = true
-rand = { workspace = true, features = ["getrandom"] }
+# vsss-rs requires rand 0.8
+rand08 = { workspace = true, features = ["getrandom"] }
 secrecy.workspace = true
 serde.workspace = true
 serde_with.workspace = true

bootstore/Cargo.toml

@@ -8,7 +8,7 @@ use crate::Sha3_256Digest;
 use crate::trust_quorum::{RackSecret, TrustQuorumError};
 use chacha20poly1305::{ChaCha20Poly1305, Key, KeyInit, aead::Aead};
 use hkdf::Hkdf;
-use rand::{RngCore, rngs::OsRng};
+use rand08::{RngCore, rngs::OsRng};
 use secrecy::{ExposeSecret, SecretBox};
 use serde::{Deserialize, Serialize};
 use sha3::{Digest, Sha3_256};
@@ -129,7 +129,7 @@ pub fn create_pkgs(
     let shares = rack_secret.split(threshold, total_shares)?;
     let share_digests = share_digests(&shares);
     let mut salt = [0u8; 32];
-    OsRng.fill_bytes(&mut salt);
+    OsRng.try_fill_bytes(&mut salt).expect("fetched random bytes");
     let cipher = derive_encryption_key(&rack_uuid, &rack_secret, &salt);
     let mut pkgs = Vec::with_capacity(n as usize);
     for i in 0..n {
@@ -181,7 +181,7 @@ pub fn create_pkgs(
 // a counter.
 fn new_nonce(i: u8) -> [u8; 12] {
     let mut nonce = [0u8; 12];
-    OsRng.fill_bytes(&mut nonce[..11]);
+    OsRng.try_fill_bytes(&mut nonce[..11]).expect("fetched random bytes");
     nonce[11] = i;
     nonce
 }
@@ -266,8 +266,7 @@ impl fmt::Debug for SharePkg {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rand::seq::SliceRandom;
-    use rand::thread_rng;
+    use rand08::seq::SliceRandom;
     use secrecy::ExposeSecret;
 
     #[test]
@@ -335,7 +334,7 @@ mod tests {
 
         // Grab a threshold of random shares and ensure that we can recompute
         // the rack secret
-        let mut rng = &mut thread_rng();
+        let mut rng = &mut rand08::thread_rng();
         let random_shares: Vec<_> =
             decrypted_shares.choose_multiple(&mut rng, 3).cloned().collect();
         let rack_secret2 = RackSecret::combine_shares(&random_shares).unwrap();

bootstore/src/schemes/v0/share_pkg.rs

@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use rand::rngs::OsRng;
+use rand08::rngs::OsRng;
 use secrecy::{ExposeSecret, SecretBox};
 use std::fmt::Debug;
 use vsss_rs::curve25519::WrappedScalar;
@@ -63,6 +63,7 @@ impl RackSecret {
     /// Create a secret based on Curve25519
     pub fn new() -> RackSecret {
         let mut rng = OsRng;
+
         RackSecret {
             secret: SecretBox::new(Box::new(Scalar::random(&mut rng))),
         }

bootstore/src/trust_quorum/rack_secret.rs

@@ -331,6 +331,19 @@ impl From<omicron_common::api::internal::shared::NetworkInterfaceKind>
     }
 }
 
+// TODO-cleanup This is icky; can we move these methods to a separate client so
+// we don't need to add this header by hand?
+// https://github.com/oxidecomputer/omicron/issues/8900
+trait ApiVersionHeader {
+    fn api_version_header(self, api_version: &'static str) -> Self;
+}
+
+impl ApiVersionHeader for reqwest::RequestBuilder {
+    fn api_version_header(self, api_version: &'static str) -> Self {
+        self.header("api-version", api_version)
+    }
+}
+
 /// Exposes additional [`Client`] interfaces for use by the test suite. These
 /// are bonus endpoints, not generated in the real client.
 #[async_trait]
@@ -353,6 +366,7 @@ impl TestInterfaces for Client {
         let url = format!("{}/vmms/{}/poke-single-step", baseurl, id);
         client
             .post(url)
+            .api_version_header(self.api_version())
             .send()
             .await
             .expect("instance_single_step() failed unexpectedly");
@@ -364,6 +378,7 @@ impl TestInterfaces for Client {
         let url = format!("{}/vmms/{}/poke", baseurl, id);
         client
             .post(url)
+            .api_version_header(self.api_version())
             .send()
             .await
             .expect("instance_finish_transition() failed unexpectedly");
@@ -375,6 +390,7 @@ impl TestInterfaces for Client {
         let url = format!("{}/disks/{}/poke", baseurl, id);
         client
             .post(url)
+            .api_version_header(self.api_version())
             .send()
             .await
             .expect("disk_finish_transition() failed unexpectedly");
@@ -390,6 +406,7 @@ impl TestInterfaces for Client {
         let url = format!("{baseurl}/vmms/{id}/sim-migration-source");
         client
             .post(url)
+            .api_version_header(self.api_version())
             .json(&params)
             .send()
             .await

clients/sled-agent-client/src/lib.rs

@@ -42,9 +42,97 @@ pub enum DecommissionError {
     ParseRow(#[from] csv::Error),
 }
 
+/// CockroachDB Node ID
+///
+/// This field is stored internally as a String to avoid questions
+/// about size, signedness, etc - it can be treated as an arbitrary
+/// unique identifier.
+#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize)]
+pub struct NodeId(pub String);
+
+impl NodeId {
+    pub fn new(id: String) -> Self {
+        Self(id)
+    }
+
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+}
+
+impl std::fmt::Display for NodeId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl std::str::FromStr for NodeId {
+    type Err = std::convert::Infallible;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(Self(s.to_string()))
+    }
+}
+
+// When parsing the underlying NodeId, we force it to be interpreted
+// as a String. Without this custom Deserialize implementation, we
+// encounter parsing errors when querying endpoints which return the
+// NodeId as an integer.
+impl<'de> serde::Deserialize<'de> for NodeId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        use serde::de::{Error, Visitor};
+        use std::fmt;
+
+        struct NodeIdVisitor;
+
+        impl<'de> Visitor<'de> for NodeIdVisitor {
+            type Value = NodeId;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                formatter
+                    .write_str("a string or integer representing a node ID")
+            }
+
+            fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+            where
+                E: Error,
+            {
+                Ok(NodeId(value.to_string()))
+            }
+
+            fn visit_string<E>(self, value: String) -> Result<Self::Value, E>
+            where
+                E: Error,
+            {
+                Ok(NodeId(value))
+            }
+
+            fn visit_i64<E>(self, value: i64) -> Result<Self::Value, E>
+            where
+                E: Error,
+            {
+                Ok(NodeId(value.to_string()))
+            }
+
+            fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
+            where
+                E: Error,
+            {
+                Ok(NodeId(value.to_string()))
+            }
+        }
+
+        deserializer.deserialize_any(NodeIdVisitor)
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub struct NodeStatus {
+    // TODO use NodeId
     pub node_id: String,
     pub address: SocketAddr,
     pub sql_address: SocketAddr,

cockroach-admin/types/src/lib.rs

@@ -8,6 +8,7 @@ license = "MPL-2.0"
 anyhow.workspace = true
 chrono.workspace = true
 cockroach-admin-client.workspace = true
+cockroach-admin-types.workspace = true
 futures.workspace = true
 parallel-task-set.workspace = true
 reqwest.workspace = true

cockroach-metrics/Cargo.toml

@@ -10,6 +10,7 @@
 use anyhow::{Context, Result};
 use chrono::{DateTime, Utc};
 use cockroach_admin_client::Client;
+use cockroach_admin_types::NodeId;
 use futures::stream::{FuturesUnordered, StreamExt};
 use parallel_task_set::ParallelTaskSet;
 use serde::{Deserialize, Serialize};
@@ -760,93 +761,6 @@ impl PrometheusMetrics {
     }
 }
 
-/// CockroachDB Node ID
-///
-/// This field is stored internally as a String to avoid questions
-/// about size, signedness, etc - it can be treated as an arbitrary
-/// unique identifier.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize)]
-pub struct NodeId(pub String);
-
-impl NodeId {
-    pub fn new(id: String) -> Self {
-        Self(id)
-    }
-
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl std::fmt::Display for NodeId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl std::str::FromStr for NodeId {
-    type Err = std::convert::Infallible;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(Self(s.to_string()))
-    }
-}
-
-// When parsing the underlying NodeId, we force it to be interpreted
-// as a String. Without this custom Deserialize implementation, we
-// encounter parsing errors when querying endpoints which return the
-// NodeId as an integer.
-impl<'de> serde::Deserialize<'de> for NodeId {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        use serde::de::{Error, Visitor};
-        use std::fmt;
-
-        struct NodeIdVisitor;
-
-        impl<'de> Visitor<'de> for NodeIdVisitor {
-            type Value = NodeId;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                formatter
-                    .write_str("a string or integer representing a node ID")
-            }
-
-            fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
-            where
-                E: Error,
-            {
-                Ok(NodeId(value.to_string()))
-            }
-
-            fn visit_string<E>(self, value: String) -> Result<Self::Value, E>
-            where
-                E: Error,
-            {
-                Ok(NodeId(value))
-            }
-
-            fn visit_i64<E>(self, value: i64) -> Result<Self::Value, E>
-            where
-                E: Error,
-            {
-                Ok(NodeId(value.to_string()))
-            }
-
-            fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
-            where
-                E: Error,
-            {
-                Ok(NodeId(value.to_string()))
-            }
-        }
-
-        deserializer.deserialize_any(NodeIdVisitor)
-    }
-}
-
 /// CockroachDB node liveness status
 ///
 /// From CockroachDB's [NodeLivenessStatus protobuf enum](https://github.com/cockroachdb/cockroach/blob/release-21.1/pkg/kv/kvserver/liveness/livenesspb/liveness.proto#L107-L138)
@@ -1281,16 +1195,16 @@ sql_exec_latency_bucket{le="0.01"} 25
         assert!(result.unwrap().metrics.is_empty());
 
         // Malformed lines (missing values, extra spaces, etc.)
-        let malformed_input = r#"
+        let malformed_input = "
 metric_name_no_value
-metric_name_with_space 
+metric_name_with_space\x20
 metric_name_multiple spaces here
 = value_no_name
  leading_space_metric 123
-trailing_space_metric 456 
+trailing_space_metric 456\x20
 metric{label=value} 789
 metric{malformed=label value} 999
-"#;
+";
         let result = PrometheusMetrics::parse(malformed_input);
         assert!(result.is_ok());
         // Should ignore malformed lines gracefully