Split instance state into Instance and VMM tables

clients/nexus-client/src/lib.rs

@@ -88,22 +88,41 @@ impl From<omicron_common::api::internal::nexus::InstanceRuntimeState>
         s: omicron_common::api::internal::nexus::InstanceRuntimeState,
     ) -> Self {
         Self {
-            run_state: s.run_state.into(),
-            sled_id: s.sled_id,
-            propolis_id: s.propolis_id,
             dst_propolis_id: s.dst_propolis_id,
-            propolis_addr: s.propolis_addr.map(|addr| addr.to_string()),
+            gen: s.gen.into(),
             migration_id: s.migration_id,
-            propolis_gen: s.propolis_gen.into(),
-            ncpus: s.ncpus.into(),
-            memory: s.memory.into(),
-            hostname: s.hostname,
+            propolis_id: s.propolis_id,
+            time_updated: s.time_updated,
+        }
+    }
+}
+
+impl From<omicron_common::api::internal::nexus::VmmRuntimeState>
+    for types::VmmRuntimeState
+{
+    fn from(s: omicron_common::api::internal::nexus::VmmRuntimeState) -> Self {
+        Self {
             gen: s.gen.into(),
+            state: s.state.into(),
             time_updated: s.time_updated,
         }
     }
 }
 
+impl From<omicron_common::api::internal::nexus::SledInstanceState>
+    for types::SledInstanceState
+{
+    fn from(
+        s: omicron_common::api::internal::nexus::SledInstanceState,
+    ) -> Self {
+        Self {
+            instance_state: s.instance_state.into(),
+            propolis_id: s.propolis_id,
+            vmm_state: s.vmm_state.into(),
+        }
+    }
+}
+
 impl From<omicron_common::api::external::InstanceState>
     for types::InstanceState
 {
@@ -124,14 +143,6 @@ impl From<omicron_common::api::external::InstanceState>
     }
 }
 
-impl From<omicron_common::api::external::InstanceCpuCount>
-    for types::InstanceCpuCount
-{
-    fn from(s: omicron_common::api::external::InstanceCpuCount) -> Self {
-        Self(s.0)
-    }
-}
-
 impl From<omicron_common::api::external::Generation> for types::Generation {
     fn from(s: omicron_common::api::external::Generation) -> Self {
         Self(i64::from(&s) as u64)

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

@@ -24,16 +24,9 @@ impl From<omicron_common::api::internal::nexus::InstanceRuntimeState>
         s: omicron_common::api::internal::nexus::InstanceRuntimeState,
     ) -> Self {
         Self {
-            run_state: s.run_state.into(),
-            sled_id: s.sled_id,
             propolis_id: s.propolis_id,
             dst_propolis_id: s.dst_propolis_id,
-            propolis_addr: s.propolis_addr.map(|addr| addr.to_string()),
             migration_id: s.migration_id,
-            propolis_gen: s.propolis_gen.into(),
-            ncpus: s.ncpus.into(),
-            memory: s.memory.into(),
-            hostname: s.hostname,
             gen: s.gen.into(),
             time_updated: s.time_updated,
         }
@@ -85,22 +78,39 @@ impl From<types::InstanceRuntimeState>
 {
     fn from(s: types::InstanceRuntimeState) -> Self {
         Self {
-            run_state: s.run_state.into(),
-            sled_id: s.sled_id,
             propolis_id: s.propolis_id,
             dst_propolis_id: s.dst_propolis_id,
-            propolis_addr: s.propolis_addr.map(|addr| addr.parse().unwrap()),
             migration_id: s.migration_id,
-            propolis_gen: s.propolis_gen.into(),
-            ncpus: s.ncpus.into(),
-            memory: s.memory.into(),
-            hostname: s.hostname,
             gen: s.gen.into(),
             time_updated: s.time_updated,
         }
     }
 }
 
+impl From<types::VmmRuntimeState>
+    for omicron_common::api::internal::nexus::VmmRuntimeState
+{
+    fn from(s: types::VmmRuntimeState) -> Self {
+        Self {
+            state: s.state.into(),
+            gen: s.gen.into(),
+            time_updated: s.time_updated,
+        }
+    }
+}
+
+impl From<types::SledInstanceState>
+    for omicron_common::api::internal::nexus::SledInstanceState
+{
+    fn from(s: types::SledInstanceState) -> Self {
+        Self {
+            instance_state: s.instance_state.into(),
+            propolis_id: s.propolis_id,
+            vmm_state: s.vmm_state.into(),
+        }
+    }
+}
+
 impl From<types::InstanceState>
     for omicron_common::api::external::InstanceState
 {

common/src/api/external/mod.rs

@@ -739,6 +739,7 @@ pub enum ResourceType {
     UpdateableComponent,
     UserBuiltin,
     Zpool,
+    Vmm,
 }
 
 // IDENTITY METADATA
@@ -866,25 +867,6 @@ impl InstanceState {
             InstanceState::Destroyed => "destroyed",
         }
     }
-
-    /// Returns true if the given state represents a fully stopped Instance.
-    /// This means that a transition from an !is_stopped() state must go
-    /// through Stopping.
-    pub fn is_stopped(&self) -> bool {
-        match self {
-            InstanceState::Starting => false,
-            InstanceState::Running => false,
-            InstanceState::Stopping => false,
-            InstanceState::Rebooting => false,
-            InstanceState::Migrating => false,
-
-            InstanceState::Creating => true,
-            InstanceState::Stopped => true,
-            InstanceState::Repairing => true,
-            InstanceState::Failed => true,
-            InstanceState::Destroyed => true,
-        }
-    }
 }
 
 /// The number of CPUs in an Instance
@@ -912,17 +894,6 @@ pub struct InstanceRuntimeState {
     pub time_run_state_updated: DateTime<Utc>,
 }
 
-impl From<crate::api::internal::nexus::InstanceRuntimeState>
-    for InstanceRuntimeState
-{
-    fn from(state: crate::api::internal::nexus::InstanceRuntimeState) -> Self {
-        InstanceRuntimeState {
-            run_state: state.run_state,
-            time_run_state_updated: state.time_updated,
-        }
-    }
-}
-
 /// View of an Instance
 #[derive(ObjectIdentity, Clone, Debug, Deserialize, Serialize, JsonSchema)]
 pub struct Instance {

common/src/api/internal/nexus.rs

@@ -29,40 +29,59 @@ pub struct DiskRuntimeState {
     pub time_updated: DateTime<Utc>,
 }
 
-/// Runtime state of the Instance, including the actual running state and minimal
-/// metadata
-///
-/// This state is owned by the sled agent running that Instance.
+/// The "static" properties of an instance: information about the instance that
+/// doesn't change while the instance is running.
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
-pub struct InstanceRuntimeState {
-    /// runtime state of the Instance
-    pub run_state: InstanceState,
-    /// which sled is running this Instance
-    pub sled_id: Uuid,
-    /// which propolis-server is running this Instance
-    pub propolis_id: Uuid,
-    /// the target propolis-server during a migration of this Instance
-    pub dst_propolis_id: Option<Uuid>,
-    /// address of propolis-server running this Instance
-    pub propolis_addr: Option<SocketAddr>,
-    /// migration id (if one in process)
-    pub migration_id: Option<Uuid>,
-    /// The generation number for the Propolis and sled identifiers for this
-    /// instance.
-    pub propolis_gen: Generation,
-    /// number of CPUs allocated for this Instance
+pub struct InstanceProperties {
     pub ncpus: InstanceCpuCount,
-    /// memory allocated for this Instance
     pub memory: ByteCount,
-    /// RFC1035-compliant hostname for the Instance.
+    /// RFC1035-compliant hostname for the instance.
     // TODO-cleanup different type?
     pub hostname: String,
-    /// generation number for this state
+}
+
+/// The dynamic runtime properties of an instance: its current VMM ID (if any),
+/// migration information (if any), and the instance state to report if there is
+/// no active VMM.
+#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
+pub struct InstanceRuntimeState {
+    /// The instance's currently active VMM ID.
+    pub propolis_id: Option<Uuid>,
+    /// If a migration is active, the ID of the target VMM.
+    pub dst_propolis_id: Option<Uuid>,
+    /// If a migration is active, the ID of that migration.
+    pub migration_id: Option<Uuid>,
+    /// Generation number for this state.
     pub gen: Generation,
-    /// timestamp for this information
+    /// Timestamp for this information.
+    pub time_updated: DateTime<Utc>,
+}
+
+/// The dynamic runtime properties of an individual VMM process.
+#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
+pub struct VmmRuntimeState {
+    /// The last state reported by this VMM.
+    pub state: InstanceState,
+    /// The generation number for this VMM's state.
+    pub gen: Generation,
+    /// Timestamp for the VMM's state.
     pub time_updated: DateTime<Utc>,
 }
 
+/// A wrapper type containing a sled's total knowledge of the state of a
+/// specific VMM and the instance it incarnates.
+#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
+pub struct SledInstanceState {
+    /// The sled's conception of the state of the instance.
+    pub instance_state: InstanceRuntimeState,
+
+    /// The ID of the VMM whose state is being reported.
+    pub propolis_id: Uuid,
+
+    /// The most recent state of the sled's VMM process.
+    pub vmm_state: VmmRuntimeState,
+}
+
 // Oximeter producer/collector objects.
 
 /// Information announced by a metric server, used so that clients can contact it and collect