more case db ops

Author: hawkw

nexus/db-model/src/fm/case.rs

@@ -39,6 +39,7 @@ pub struct CaseEreport {
     pub case_id: DbTypedUuid<CaseKind>,
     pub sitrep_id: DbTypedUuid<SitrepKind>,
     pub assigned_sitrep_id: DbTypedUuid<SitrepKind>,
+    pub comment: String,
 }
 
 #[derive(Queryable, Insertable, Clone, Debug, Selectable)]

nexus/db-queries/src/db/datastore/fm.rs

@@ -180,6 +180,8 @@ impl DataStore {
                     for model::fm::CaseEreport {
                         restart_id,
                         ena: DbEna(ena),
+                        comment,
+                        assigned_sitrep_id,
                         ..
                     } in ereport_assignments
                     {
@@ -202,7 +204,13 @@ impl DataStore {
                                 entry.insert(Arc::new(ereport)).clone()
                             }
                         };
-                        ereports.insert_unique(ereport).unwrap();
+                        ereports
+                            .insert_unique(fm::case::CaseEreport {
+                                ereport,
+                                assigned_sitrep_id: assigned_sitrep_id.into(),
+                                comment,
+                            })
+                            .unwrap();
                     }
 
                     cases
@@ -218,6 +226,7 @@ impl DataStore {
                             comment: case.comment,
                             ereports,
                             alerts_requested,
+                            impacted_sp_slots: Default::default(), // TODO
                         })
                         .expect("case UUIDs should be unique");
                 }
@@ -1228,7 +1237,7 @@ mod tests {
     ) -> Result<BTreeSet<SitrepUuid>, Error> {
         let mut listed_orphans = BTreeSet::new();
         let mut paginator = Paginator::new(
-            crate::dbSQL_BATC::datastore::H_SIZE,
+            SQL_BATCH_SIZE,
             dropshot::PaginationOrder::Descending,
         );
         while let Some(p) = paginator.next() {

nexus/db-schema/src/schema.rs

@@ -2884,6 +2884,8 @@ table! {
         case_id -> Uuid,
         sitrep_id -> Uuid,
         assigned_sitrep_id -> Uuid,
+
+        comment -> Text,
     }
 }
 

nexus/fm/src/de/power_shelf.rs

@@ -34,7 +34,7 @@ pub fn diagnose(
             Some("hw.insert.psu") => {
                 let psc_psu = extract_psc_psu(&ereport, slot, &sitrep.log);
                 let mut case = sitrep.open_case(DiagnosisEngine::PowerShelf)?;
-                case.add_ereport(ereport);
+                case.add_ereport(ereport, "PSU inserted ereport");
                 case.comment =
                     format!("PSC {slot} PSU {:?} inserted", psc_psu.psu_slot);
                 case.request_alert(&alert::power_shelf::PsuInserted::V0 {
@@ -46,7 +46,7 @@ pub fn diagnose(
             Some("hw.remove.psu") => {
                 let psc_psu = extract_psc_psu(&ereport, slot, &sitrep.log);
                 let mut case = sitrep.open_case(DiagnosisEngine::PowerShelf)?;
-                case.add_ereport(ereport);
+                case.add_ereport(ereport, "PSU removed ereport");
                 case.comment =
                     format!("PSC {slot} PSU {:?} removed", psc_psu.psu_slot);
                 case.request_alert(&alert::power_shelf::PsuRemoved::V0 {

nexus/fm/src/lib.rs

@@ -177,8 +177,16 @@ impl CaseBuilder {
         slog::info!(&self.log, "case closed");
     }
 
-    pub fn add_ereport(&mut self, report: &Arc<fm::Ereport>) {
-        match self.case.ereports.insert_unique(report.clone()) {
+    pub fn add_ereport(
+        &mut self,
+        report: &Arc<fm::Ereport>,
+        comment: impl std::fmt::Display,
+    ) {
+        match self.case.ereports.insert_unique(fm::case::CaseEreport {
+            ereport: report.clone(),
+            assigned_sitrep_id: self.sitrep_id,
+            comment: comment.to_string(),
+        }) {
             Ok(_) => {
                 slog::info!(
                     self.log,

schema/crdb/dbinit.sql

@@ -6887,6 +6887,8 @@ CREATE TABLE IF NOT EXISTS omicron.public.fm_ereport_in_case (
     -- case.
     assigned_sitrep_id UUID NOT NULL,
 
+    comment TEXT NOT NULL,
+
     PRIMARY KEY (sitrep_id, restart_id, ena)
 );