PR feedback; pass job_id in missed location, add FK back to error table and remove IF NOT EXISTS

Author: Jamesbarford

collector/src/bin/collector.rs

@@ -1511,7 +1511,7 @@ async fn run_job_queue_benchmarks(
                         // not with a benchmark.
                         conn.record_error(
                             artifact_row_id,
-                            &format!("job:{}", benchmark_job.id()),
+                            &format!("exhausted retry count"),
                             &format!("Error while benchmarking job {benchmark_job:?}: {error:?}"),
                             Some(benchmark_job.id()),
                         )
@@ -2174,6 +2174,7 @@ async fn run_benchmarks(
             &collector,
             runtime.filter,
             runtime.iterations,
+            shared.job_id,
         )
         .await
         .context("Runtime benchmarks failed")

collector/src/runtime/mod.rs

@@ -35,6 +35,7 @@ pub async fn bench_runtime(
     collector: &CollectorCtx,
     filter: RuntimeBenchmarkFilter,
     iterations: u32,
+    job_id: Option<u32>,
 ) -> anyhow::Result<()> {
     let filtered = suite.filtered_benchmark_count(&filter);
     println!("Executing {filtered} benchmarks\n");
@@ -93,7 +94,7 @@ pub async fn bench_runtime(
                     collector.artifact_row_id,
                     &step_name,
                     &format!("{error:?}"),
-                    None,
+                    job_id,
                 )
                 .await;
         };

database/src/pool/postgres.rs

@@ -388,9 +388,9 @@ static MIGRATIONS: &[&str] = &[
     ALTER TABLE collector_config ADD COLUMN commit_sha TEXT NULL;
     "#,
     r#"
-    CREATE TABLE IF NOT EXISTS error_new (
+    CREATE TABLE error_new (
         id      SERIAL PRIMARY KEY,
-        aid     INTEGER NOT NULL,
+        aid     INTEGER NOT NULL REFERENCES artifact(id) ON DELETE CASCADE ON UPDATE CASCADE,
         message TEXT NOT NULL,
         context TEXT NOT NULL,
         job_id  INTEGER
@@ -408,7 +408,7 @@ static MIGRATIONS: &[&str] = &[
     DROP TABLE error;
     ALTER TABLE error_new RENAME TO error;
 
-    CREATE INDEX IF NOT EXISTS error_artifact_idx ON error(aid);
+    CREATE INDEX error_artifact_idx ON error(aid);
     "#,
 ];