wip: post-substantial-rebase cleanup

Author: lif

common/src/api/internal/nexus.rs

@@ -84,7 +84,7 @@ pub struct SledInstanceState {
 /// Tells sled-agent whether an instance whose status it's reporting is still
 /// relevant, or if it's timed out during creation and been marked as failed
 /// (such that sled-agent can destroy the tardy instance)
-#[derive(Serialize, JsonSchema)]
+#[derive(Clone, Copy, Serialize, JsonSchema)]
 #[serde(rename_all = "snake_case", tag = "last_result", content = "details")]
 pub enum HandleInstancePutResultResult {
     Ok,

nexus/src/app/instance.rs

@@ -29,7 +29,6 @@ use nexus_db_queries::db::identity::Resource;
 use nexus_db_queries::db::lookup;
 use nexus_db_queries::db::lookup::LookupPath;
 use nexus_types::external_api::views;
-use nexus_types::internal_api::views::HandleInstancePutResultResult;
 use omicron_common::api::external::http_pagination::PaginatedBy;
 use omicron_common::api::external::ByteCount;
 use omicron_common::api::external::CreateResult;

sled-agent/src/instance.rs

@@ -1642,7 +1642,11 @@ mod tests {
                         "couldn't send SledInstanceState to test driver",
                     )
                 })?;
-            todo!()
+            self.nexus_disposition
+                .borrow()
+                .as_ref()
+                .cloned()
+                .ok_or(omicron_common::api::external::Error::unavail("did not set nexus_disposition in FakeNexusServer"))
         }
 
         fn cpapi_handle_instance_put_failure(
@@ -1660,7 +1664,11 @@ mod tests {
                         "couldn't send error to test driver",
                     )
                 })?;
-            todo!()
+            self.nexus_disposition
+                .borrow()
+                .as_ref()
+                .cloned()
+                .ok_or(omicron_common::api::external::Error::unavail("did not set nexus_disposition in FakeNexusServer"))
         }
     }
 
@@ -1953,9 +1961,12 @@ mod tests {
         let _mock_vnic_contexts = mock_vnic_contexts();
         let _mock_zone_contexts = mock_zone_contexts();
 
-        let FakeNexusParts { nexus_client, nexus_server, mut state_rx, .. } =
+        let FakeNexusParts { nexus_client, nexus_server, mut state_rx, disp_tx } =
             FakeNexusParts::new(&logctx);
 
+        disp_tx.send(Some(HandleInstancePutResultResult::Ok))
+            .expect("couldn't send nexus_disposition");
+
         let (_dns_server, resolver, _dns_config_dir) =
             timeout(TIMEOUT_DURATION, dns_server(&logctx, &nexus_server))
                 .await
@@ -1978,13 +1989,17 @@ mod tests {
         .await
         .expect("timed out creating Instance struct");
 
-        timeout(
-            TIMEOUT_DURATION,
-            inst.put_state(InstanceStateRequested::Running),
-        )
-        .await
-        .expect("timed out waiting for Instance::put_state")
-        .unwrap();
+        let (put_tx, put_rx) = oneshot::channel();
+
+        inst.put_state(put_tx, InstanceStateRequested::Running)
+            .await
+            .expect("failed to send Instance::put_state");
+
+        timeout(TIMEOUT_DURATION, put_rx)
+            .await
+            .expect("timed out waiting for Instance::put_state result")
+            .expect("failed to receive Instance::put_state result")
+            .expect("Instance::put_state failed");
 
         timeout(
             TIMEOUT_DURATION,
@@ -1997,7 +2012,7 @@ mod tests {
         )
         .await
         .expect("timed out waiting for InstanceState::Running in FakeNexus")
-        .unwrap();
+        .expect("failed to receive FakeNexus' InstanceState");
 
         logctx.cleanup_successful();
     }
@@ -2013,9 +2028,12 @@ mod tests {
         let _mock_vnic_contexts = mock_vnic_contexts();
         let _mock_zone_contexts = mock_zone_contexts();
 
-        let FakeNexusParts { nexus_client, nexus_server, state_rx, .. } =
+        let FakeNexusParts { nexus_client, nexus_server, state_rx, disp_tx } =
             FakeNexusParts::new(&logctx);
 
+        disp_tx.send(Some(HandleInstancePutResultResult::Ok))
+            .expect("couldn't send nexus_disposition");
+
         let (_dns_server, resolver, _dns_config_dir) =
             timeout(TIMEOUT_DURATION, dns_server(&logctx, &nexus_server))
                 .await
@@ -2039,7 +2057,13 @@ mod tests {
         .await
         .expect("timed out creating Instance struct");
 
-        timeout(TIMEOUT_DURATION, inst.put_state(InstanceStateRequested::Running))
+        let (put_tx, put_rx) = oneshot::channel();
+
+        inst.put_state(put_tx, InstanceStateRequested::Running)
+            .await
+            .expect("failed to send Instance::put_state");
+
+        timeout(TIMEOUT_DURATION, put_rx)
             .await
             .expect_err("*should've* timed out waiting for Instance::put_state, but didn't?");
 
@@ -2076,9 +2100,14 @@ mod tests {
         let halt_rm_ctx = MockZones::halt_and_remove_logged_context();
         halt_rm_ctx.expect().times(..).returning(|_, _| Ok(()));
 
-        let FakeNexusParts { nexus_client, nexus_server, state_rx, .. } =
+        let FakeNexusParts { nexus_client, nexus_server, state_rx, disp_tx } =
             FakeNexusParts::new(&logctx);
 
+        disp_tx.send(Some(HandleInstancePutResultResult::TimedOut {
+            generation: Generation(5)
+        }))
+            .expect("couldn't send nexus_disposition");
+
         let (_dns_server, resolver, _dns_config_dir) =
             timeout(TIMEOUT_DURATION, dns_server(&logctx, &nexus_server))
                 .await
@@ -2102,7 +2131,13 @@ mod tests {
         .await
         .expect("timed out creating Instance struct");
 
-        timeout(TIMEOUT_DURATION, inst.put_state(InstanceStateRequested::Running))
+        let (put_tx, put_rx) = oneshot::channel();
+
+        inst.put_state(put_tx, InstanceStateRequested::Running)
+            .await
+            .expect("failed to send Instance::put_state");
+
+        timeout(TIMEOUT_DURATION, put_rx)
             .await
             .expect_err("*should've* timed out waiting for Instance::put_state, but didn't?");
 

sled-agent/src/instance_manager.rs

@@ -833,7 +833,7 @@ impl InstanceTicket {
 
     #[cfg(test)]
     pub(crate) fn new_without_manager_for_test(id: Uuid) -> Self {
-        Self { id, inner: None }
+        Self { id, terminate_tx: None }
     }
 
     /// Idempotently removes this instance from the tracked set of

sled-agent/src/params.rs

@@ -115,7 +115,7 @@ pub struct InstancePutStateBody {
 
 /// The response sent from a request to move an instance into a specific runtime
 /// state.
-#[derive(Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct InstancePutStateResponse {
     /// The current runtime state of the instance after handling the request to
     /// change its state. If the instance's state did not change, this field is