refine error messages about not having a propolis address

v2, without also messing with serial console parameters along the way
oxidecomputer · Feb 28, 2025 · 8784bd4 · 8784bd4
1 parent a588367
commit 8784bd4
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 11 deletions.
diff --git a/nexus/src/app/instance.rs b/nexus/src/app/instance.rs
@@ -1676,29 +1676,30 @@ impl super::Nexus {
             match vmm.runtime.state {
                 DbVmmState::Running
                 | DbVmmState::Rebooting
-                | DbVmmState::Migrating => {
-                    Ok((vmm.clone(), SocketAddr::new(vmm.propolis_ip.ip(), vmm.propolis_port.into())))
-                }
+                | DbVmmState::Migrating => Ok((
+                    vmm.clone(),
+                    SocketAddr::new(
+                        vmm.propolis_ip.ip(),
+                        vmm.propolis_port.into(),
+                    ),
+                )),
 
                 DbVmmState::Starting
                 | DbVmmState::Stopping
                 | DbVmmState::Stopped
                 | DbVmmState::Failed
-                | DbVmmState::Creating => {
+                | DbVmmState::Creating
+                | DbVmmState::Destroyed
+                | DbVmmState::SagaUnwound => {
                     Err(Error::invalid_request(format!(
-                        "cannot connect to serial console of instance in state \"{}\"",
+                        "cannot administer instance in state \"{}\"",
                         state.effective_state(),
                     )))
                 }
-
-                DbVmmState::Destroyed | DbVmmState::SagaUnwound => Err(Error::invalid_request(
-                    "cannot connect to serial console of instance in state \"Stopped\"",
-                )),
             }
         } else {
             Err(Error::invalid_request(format!(
-                "instance is {} and has no active serial console \
-                    server",
+                "instance is {} and cannot be administered",
                 state.effective_state(),
             )))
         }

diff --git a/nexus/tests/integration_tests/instances.rs b/nexus/tests/integration_tests/instances.rs
@@ -5394,6 +5394,8 @@ async fn test_instance_serial(cptestctx: &ControlPlaneTestContext) {
     // Make sure we get a 404 if we try to access the serial console before creation.
     let instance_serial_url =
         get_instance_url(format!("{}/serial-console", instance_name).as_str());
+    let instance_serial_stream_url =
+        get_instance_url(format!("{}/serial-console/stream", instance_name).as_str());
     let error: HttpErrorResponseBody = NexusRequest::expect_failure(
         client,
         StatusCode::NOT_FOUND,
@@ -5491,6 +5493,53 @@ async fn test_instance_serial(cptestctx: &ControlPlaneTestContext) {
             > instance.runtime.time_run_state_updated
     );
 
+    // As the instance is now stopping, we can't connect to its serial console
+    // anymore. We also can't get its cached data; the (simulated) Propolis is
+    // going away.
+
+    let builder = RequestBuilder::new(
+        client,
+        http::Method::GET,
+        &instance_serial_stream_url,
+    )
+    .expect_status(Some(http::StatusCode::BAD_REQUEST));
+
+    let error = NexusRequest::new(builder)
+        .authn_as(AuthnMode::PrivilegedUser)
+        .execute()
+        .await
+        .unwrap()
+        .parsed_body::<dropshot::HttpErrorResponseBody>()
+        .unwrap();
+
+    assert_eq!(
+        error.message,
+        "cannot administer instance in state \"stopping\"",
+    );
+
+    // Have to pass some offset for the cached data request otherwise we'll
+    // error out of Nexus early on while validating parameters, before
+    // discovering the serial console is unreachable.
+    let builder = RequestBuilder::new(
+        client,
+        http::Method::GET,
+        &format!("{}&from_start=0", instance_serial_url),
+    )
+    .expect_status(Some(http::StatusCode::BAD_REQUEST));
+
+    let error = NexusRequest::new(builder)
+        .authn_as(AuthnMode::PrivilegedUser)
+        .execute()
+        .await
+        .unwrap()
+        .parsed_body::<dropshot::HttpErrorResponseBody>()
+        .unwrap();
+
+    assert_eq!(
+        error.message,
+        "cannot administer instance in state \"stopping\"",
+    );
+
     let instance = instance_next;
     instance_simulate(nexus, &instance_id).await;
     let instance_next =