supply real volume data to propolis (#771)

Instance creation now can specify that existing disks be attached to
the instance (disk creation during instance creation is not yet
implemented).

There's a few important changes here.

Nexus will instruct the sled agent to send volume construction requests
when it ensures the instance, and therefore has to build these requests.
This is done in sdc_regions_ensure as regions are allocated.

sic_create_instance_record no longer returns the runtime of an instance,
but the instance's name.

Importantly, the instance creation saga now calls Nexus'
instance_set_runtime instead of duplicating the logic to call
instance_put. Nexus' instance_set_runtime will populate the
InstanceHardware with NICs and disks.

Nexus' disk_set_runtime now *optionally* calls the sled agent's
disk_put if the instance is running already, otherwise the disk will be
attached as part of the instance ensure by specifying volume requests.

request_body_max_bytes had to be increased to 1M because the volume
requests could be arbitrarily large (and eventually, the cloud init
bytes will add to the body size too).

Note: spawning an instance with this *will not work* unless the propolis
zone has a valid static IPv6 address. This PR has grown enough that I
think that work should be separate.

This PR also sets the maximum number of disks that can be attached to
an instance at 8.

Author: jmpesp

Cargo.lock

@@ -296,6 +296,12 @@ impl<T: ClientError> From<progenitor::progenitor_client::Error<T>> for Error {
     }
 }
 
+impl From<serde_json::Error> for Error {
+    fn from(e: serde_json::Error) -> Self {
+        Error::internal_error(&e.to_string())
+    }
+}
+
 /// Like [`assert!`], except that instead of panicking, this function returns an
 /// `Err(Error::InternalError)` with an appropriate message if the given
 /// condition is not true.

common/src/api/external/error.rs

@@ -11,9 +11,10 @@ path = "../rpaths"
 anyhow = "1.0"
 async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "c849b717be" }
 async-trait = "0.1.51"
+base64 = "0.13.0"
 bb8 = "0.7.1"
 cookie = "0.16"
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "3e7e49eeb88fa8ad74375b0642aabd4224b1f2cb" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "945daedb88cefa790f1d994b3a038b8fa9ac514a" }
 # Tracking pending 2.0 version.
 diesel = { git = "https://github.com/diesel-rs/diesel", rev = "ce77c382", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
 futures = "0.3.21"

nexus/Cargo.toml

@@ -646,7 +646,11 @@ impl Sled {
 
     pub fn address(&self) -> SocketAddr {
         // TODO: avoid this unwrap
-        SocketAddr::new(self.ip.ip(), u16::try_from(self.port).unwrap())
+        self.address_with_port(u16::try_from(self.port).unwrap())
+    }
+
+    pub fn address_with_port(&self, port: u16) -> SocketAddr {
+        SocketAddr::new(self.ip.ip(), port)
     }
 }
 
@@ -787,7 +791,11 @@ impl Dataset {
 
     pub fn address(&self) -> SocketAddr {
         // TODO: avoid this unwrap
-        SocketAddr::new(self.ip.ip(), u16::try_from(self.port).unwrap())
+        self.address_with_port(u16::try_from(self.port).unwrap())
+    }
+
+    pub fn address_with_port(&self, port: u16) -> SocketAddr {
+        SocketAddr::new(self.ip.ip(), port)
     }
 }
 
@@ -905,6 +913,10 @@ impl Volume {
             data,
         }
     }
+
+    pub fn data(&self) -> &str {
+        &self.data
+    }
 }
 
 /// Describes an organization within the database.
@@ -1266,6 +1278,10 @@ impl Disk {
     pub fn runtime(&self) -> DiskRuntimeState {
         self.runtime_state.clone()
     }
+
+    pub fn id(&self) -> Uuid {
+        self.identity.id
+    }
 }
 
 /// Conversion to the external API type.
@@ -1319,6 +1335,17 @@ impl DiskRuntimeState {
         }
     }
 
+    pub fn attach(self, instance_id: Uuid) -> Self {
+        Self {
+            disk_state: external::DiskState::Attached(instance_id)
+                .label()
+                .to_string(),
+            attach_instance_id: Some(instance_id),
+            gen: self.gen.next().into(),
+            time_updated: Utc::now(),
+        }
+    }
+
     pub fn detach(self) -> Self {
         Self {
             disk_state: external::DiskState::Detached.label().to_string(),
@@ -1339,6 +1366,15 @@ impl DiskRuntimeState {
             .unwrap(),
         )
     }
+
+    pub fn faulted(self) -> Self {
+        Self {
+            disk_state: external::DiskState::Faulted.label().to_string(),
+            attach_instance_id: None,
+            gen: self.gen.next().into(),
+            time_updated: Utc::now(),
+        }
+    }
 }
 
 /// Conversion from the internal API type.

nexus/src/db/model.rs

@@ -105,6 +105,23 @@ impl Default for InstanceNetworkInterfaceAttachment {
     }
 }
 
+/// Describe the instance's disks at creation time
+#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum InstanceDiskAttachment {
+    /// During instance creation, create and attach disks
+    Create(DiskCreate),
+
+    /// During instance creation, attach this disk
+    Attach(InstanceDiskAttach),
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
+pub struct InstanceDiskAttach {
+    /// A disk name to attach
+    pub disk: Name,
+}
+
 /// Create-time parameters for an [`Instance`](omicron_common::api::external::Instance)
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
 pub struct InstanceCreate {
@@ -117,6 +134,10 @@ pub struct InstanceCreate {
     /// The network interfaces to be created for this instance.
     #[serde(default)]
     pub network_interfaces: InstanceNetworkInterfaceAttachment,
+
+    /// The disks to be created or attached for this instance.
+    #[serde(default)]
+    pub disks: Vec<InstanceDiskAttachment>,
 }
 
 /// Migration parameters for an [`Instance`](omicron_common::api::external::Instance)

nexus/src/external_api/params.rs

@@ -1,6 +1,7 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // 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/.
+#![feature(async_closure)]
 
 //! Library interface to the Nexus, the heart of the control plane