compiler panic

oxidecomputer · Oct 16, 2023 · 8650521 · 8650521
1 parent c06c1be
commit 8650521
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 11 deletions.
diff --git a/nexus/db-model/src/inventory.rs b/nexus/db-model/src/inventory.rs
@@ -145,7 +145,6 @@ pub struct InvCollection {
     pub time_started: DateTime<Utc>,
     pub time_done: DateTime<Utc>,
     pub collector: String,
-    pub comment: String,
 }
 
 impl<'a> From<&'a Collection> for InvCollection {
@@ -155,7 +154,6 @@ impl<'a> From<&'a Collection> for InvCollection {
             time_started: c.time_started,
             time_done: c.time_done,
             collector: c.collector.clone(),
-            comment: c.comment.clone(),
         }
     }
 }

diff --git a/nexus/db-model/src/schema.rs b/nexus/db-model/src/schema.rs
@@ -1142,7 +1142,6 @@ table! {
         time_started -> Timestamptz,
         time_done -> Timestamptz,
         collector -> Text,
-        comment -> Text,
     }
 }
 

diff --git a/nexus/inventory/src/builder.rs b/nexus/inventory/src/builder.rs
@@ -27,7 +27,6 @@ pub struct CollectionBuilder {
     errors: Vec<anyhow::Error>,
     time_started: DateTime<Utc>,
     collector: String,
-    comment: String,
     baseboards: BTreeSet<Arc<BaseboardId>>,
     cabooses: BTreeSet<Arc<Caboose>>,
     sps: BTreeMap<Arc<BaseboardId>, ServiceProcessor>,
@@ -37,12 +36,11 @@ pub struct CollectionBuilder {
 }
 
 impl CollectionBuilder {
-    pub fn new(collector: &str, comment: &str) -> Self {
+    pub fn new(collector: &str) -> Self {
         CollectionBuilder {
             errors: vec![],
             time_started: Utc::now(),
             collector: collector.to_owned(),
-            comment: comment.to_owned(),
             baseboards: BTreeSet::new(),
             cabooses: BTreeSet::new(),
             sps: BTreeMap::new(),
@@ -58,7 +56,6 @@ impl CollectionBuilder {
             time_started: self.time_started,
             time_done: Utc::now(),
             collector: self.collector,
-            comment: self.comment,
             baseboards: self.baseboards,
             cabooses: self.cabooses,
             sps: self.sps,

diff --git a/nexus/src/app/background/inventory_collection.rs b/nexus/src/app/background/inventory_collection.rs
@@ -110,7 +110,6 @@ async fn inventory_activate(
     // Run a collection.
     let inventory = nexus_inventory::Collector::new(
         creator,
-        "activation", // XXX-dap useless
         &mgs_clients,
     );
     let collection =

diff --git a/nexus/types/src/inventory.rs b/nexus/types/src/inventory.rs
@@ -33,8 +33,6 @@ pub struct Collection {
     pub time_done: DateTime<Utc>,
     /// name of the agent doing the collecting (generally, this Nexus's uuid)
     pub collector: String,
-    /// reason for triggering this collection
-    pub comment: String,
 
     pub baseboards: BTreeSet<Arc<BaseboardId>>,
     pub cabooses: BTreeSet<Arc<Caboose>>,

diff --git a/schema/crdb/dbinit.sql b/schema/crdb/dbinit.sql
@@ -2590,7 +2590,6 @@ CREATE TABLE IF NOT EXISTS inv_collection (
     time_started TIMESTAMPTZ NOT NULL,
     time_done TIMESTAMPTZ NOT NULL,
     collector TEXT NOT NULL,
-    comment TEXT NOT NULL
 );
 -- Supports finding latest collection (to use) or the oldest collection (to
 -- clean up)