Configure tfport uplinks via uplink service (#3765)

Co-authored-by: Andrew J. Stone <andrew.j.stone.1@gmail.com>
Co-authored-by: Nils Nieuwejaar <nils@oxidecomputer.com>
Co-authored-by: Ryan Goodfellow <ryan.goodfellow@oxide.computer>

Author: 4 people

common/src/api/internal/shared.rs

@@ -101,7 +101,7 @@ pub struct UplinkConfig {
 
 /// Identifies switch physical location
 #[derive(
-    Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema, Hash, Eq,
+    Clone, Copy, Debug, Deserialize, Serialize, PartialEq, JsonSchema, Hash, Eq,
 )]
 #[serde(rename_all = "snake_case")]
 pub enum SwitchLocation {

common/src/backoff.rs

@@ -17,7 +17,9 @@ use std::time::Instant;
 
 pub use ::backoff::future::{retry, retry_notify};
 pub use ::backoff::Error as BackoffError;
-pub use ::backoff::{backoff::Backoff, ExponentialBackoff, Notify};
+pub use ::backoff::{
+    backoff::Backoff, ExponentialBackoff, ExponentialBackoffBuilder, Notify,
+};
 
 /// A helper function which modifies what information is tracked within the
 /// callback of the notify function.

illumos-utils/src/lib.rs

@@ -65,6 +65,7 @@ pub enum ExecutionError {
 #[cfg_attr(any(test, feature = "testing"), mockall::automock, allow(dead_code))]
 mod inner {
     use super::*;
+    use std::process::Stdio;
 
     fn to_string(command: &mut std::process::Command) -> String {
         command
@@ -93,13 +94,15 @@ mod inner {
     // Helper functions for starting the process and checking the
     // exit code result.
 
-    pub fn spawn(
+    pub fn spawn_with_piped_stdout_and_stderr(
         command: &mut std::process::Command,
     ) -> Result<std::process::Child, ExecutionError> {
-        command.spawn().map_err(|err| ExecutionError::ExecutionStart {
-            command: to_string(command),
-            err,
-        })
+        command.stdout(Stdio::piped()).stderr(Stdio::piped()).spawn().map_err(
+            |err| ExecutionError::ExecutionStart {
+                command: to_string(command),
+                err,
+            },
+        )
     }
 
     pub fn run_child(

illumos-utils/src/running_zone.rs

@@ -381,10 +381,10 @@ impl RunningZone {
         }
         let command = command.args(args);
 
-        let child = crate::spawn(command).map_err(|err| RunCommandError {
-            zone: self.name().to_string(),
-            err,
-        })?;
+        let child =
+            crate::spawn_with_piped_stdout_and_stderr(command).map_err(
+                |err| RunCommandError { zone: self.name().to_string(), err },
+            )?;
 
         // Record the process contract now in use by the child; the contract
         // just created from the template that we applied to this thread
@@ -437,10 +437,10 @@ impl RunningZone {
         // that's actually run is irrelevant.
         let mut command = std::process::Command::new("echo");
         let command = command.args(args);
-        let child = crate::spawn(command).map_err(|err| RunCommandError {
-            zone: self.name().to_string(),
-            err,
-        })?;
+        let child =
+            crate::spawn_with_piped_stdout_and_stderr(command).map_err(
+                |err| RunCommandError { zone: self.name().to_string(), err },
+            )?;
         crate::run_child(command, child)
             .map_err(|err| RunCommandError {
                 zone: self.name().to_string(),

internal-dns/src/resolver.rs

@@ -139,6 +139,11 @@ impl Resolver {
         Resolver::new_from_addrs(log, dns_ips)
     }
 
+    /// Remove all entries from the resolver's cache.
+    pub fn clear_cache(&self) {
+        self.resolver.clear_cache();
+    }
+
     /// Looks up a single [`Ipv6Addr`] based on the SRV name.
     /// Returns an error if the record does not exist.
     // TODO: There are lots of ways this API can expand: Caching,

nexus/src/app/mod.rs

@@ -209,7 +209,7 @@ impl Nexus {
                 &format!("http://[{address}]:{port}"),
                 client_state.clone(),
             );
-            dpd_clients.insert(location.clone(), Arc::new(dpd_client));
+            dpd_clients.insert(*location, Arc::new(dpd_client));
         }
         if config.pkg.dendrite.is_empty() {
             loop {
@@ -232,8 +232,7 @@ impl Nexus {
                                 &format!("http://[{addr}]:{port}"),
                                 client_state.clone(),
                             );
-                            dpd_clients
-                                .insert(location.clone(), Arc::new(dpd_client));
+                            dpd_clients.insert(*location, Arc::new(dpd_client));
                         }
                         break;
                     }

nexus/src/app/sagas/instance_create.rs

@@ -330,7 +330,7 @@ impl NexusSaga for SagaInstanceCreate {
         // If a primary NIC exists, create a NAT entry for the default external IP,
         // as well as additional NAT entries for each requested ephemeral IP
         for i in 0..(params.create_params.external_ips.len() + 1) {
-            for switch_location in &params.boundary_switches {
+            for &switch_location in &params.boundary_switches {
                 let subsaga_name = SagaName::new(&format!(
                     "instance-configure-nat-{i}-{switch_location}"
                 ));
@@ -346,7 +346,7 @@ impl NexusSaga for SagaInstanceCreate {
                     saga_params: params.clone(),
                     instance_id,
                     which: i,
-                    switch_location: switch_location.clone(),
+                    switch_location,
                 };
                 subsaga_append(
                     basename,

nexus/test-utils/src/lib.rs

@@ -354,7 +354,7 @@ impl<'a, N: NexusServer> ControlPlaneTestContextBuilder<'a, N> {
         // Set up a stub instance of dendrite
         let dendrite = dev::dendrite::DendriteInstance::start(0).await.unwrap();
         let port = dendrite.port;
-        self.dendrite.insert(switch_location.clone(), dendrite);
+        self.dendrite.insert(switch_location, dendrite);
 
         let address = SocketAddrV6::new(Ipv6Addr::LOCALHOST, port, 0, 0);
 

openapi/sled-agent.json

@@ -2221,13 +2221,6 @@
               "format": "ipv6"
             }
           },
-          "boundary_switches": {
-            "type": "array",
-            "items": {
-              "type": "string",
-              "format": "ipv6"
-            }
-          },
           "dataset": {
             "nullable": true,
             "default": null,
@@ -2253,7 +2246,6 @@
         },
         "required": [
           "addresses",
-          "boundary_switches",
           "id",
           "services",
           "zone_type"

package-manifest.toml

@@ -421,8 +421,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "db270160e514a14dd409a8e1455756d017d54ae0"
-source.sha256 = "72233bc4d7b2d47b7cb170ac366b94abcb25f32a8edadaf3d85d17fd0cc22230"
+source.commit = "ef8a97532214c795abb6c7de05289c161e9a80ca"
+source.sha256 = "a63c05e81cf58efd28f89f4f860f4e5e68865c234eb071bec03184437521245b"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -446,8 +446,8 @@ only_for_targets.image = "standard"
 # 2. Copy the output zone image from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "db270160e514a14dd409a8e1455756d017d54ae0"
-source.sha256 = "e844ad779fe1e390fa5de707e2be66c2882cb36e96c489009a8609516df09d6b"
+source.commit = "ef8a97532214c795abb6c7de05289c161e9a80ca"
+source.sha256 = "7a828286c4e3c97cff56b347fa5922acb6ba93fd8fdfb3e9ea61f1d5fb9b53a5"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -464,8 +464,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "db270160e514a14dd409a8e1455756d017d54ae0"
-source.sha256 = "24098c91ba9057d0c33571ee28a859bc480009bc55bdf7fa03882b4ab1542dbe"
+source.commit = "ef8a97532214c795abb6c7de05289c161e9a80ca"
+source.sha256 = "aef8ecec0ebdbf8ea790cb65702be636b7e1fae007dcd1434fdba2bc4ccbc06f"
 output.type = "zone"
 output.intermediate_only = true