Handle bundle cleanup from deleted zpool

oxidecomputer · Dec 16, 2024 · 51be611 · 51be611
1 parent 5cc668e
commit 51be611
Show file tree

Hide file tree

Showing 2 changed files with 275 additions and 115 deletions.
diff --git a/nexus/db-queries/src/db/datastore/zpool.rs b/nexus/db-queries/src/db/datastore/zpool.rs
@@ -288,7 +288,15 @@ impl DataStore {
             .select(dsl::sled_id)
             .first_async::<Uuid>(&*conn)
             .await
-            .map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))?;
+            .map_err(|e| {
+                public_error_from_diesel(
+                    e,
+                    ErrorHandler::NotFoundByLookup(
+                        ResourceType::Zpool,
+                        LookupType::by_id(id.into_untyped_uuid()),
+                    ),
+                )
+            })?;
 
         Ok(SledUuid::from_untyped_uuid(id))
     }