Fix; Skip adding a parent_sha if the parent_sha has not been benchmarked ever

Author: Jamesbarford

database/src/lib.rs

@@ -1036,7 +1036,7 @@ impl BenchmarkRequest {
     }
 
     pub fn is_in_progress(&self) -> bool {
-        matches!(self.status, BenchmarkRequestStatus::InProgress { .. })
+        matches!(self.status, BenchmarkRequestStatus::InProgress)
     }
 }
 

site/src/job_queue/mod.rs

@@ -205,6 +205,7 @@ pub async fn build_queue(
 pub async fn enqueue_benchmark_request(
     conn: &mut dyn database::pool::Connection,
     benchmark_request: &BenchmarkRequest,
+    index: &BenchmarkRequestIndex,
 ) -> anyhow::Result<()> {
     let mut tx = conn.transaction().await;
 
@@ -216,6 +217,8 @@ pub async fn enqueue_benchmark_request(
 
     let backends = benchmark_request.backends()?;
     let profiles = benchmark_request.profiles()?;
+    // Prevent the error from spamming the logs
+    let mut has_emitted_parent_sha_error = false;
 
     // Target x benchmark_set x backend x profile -> BenchmarkJob
     for target in Target::all() {
@@ -237,15 +240,22 @@ pub async fn enqueue_benchmark_request(
                     // but was already benchmarked then the collector will ignore
                     // it as it will see it already has results.
                     if let Some(parent_sha) = benchmark_request.parent_sha() {
-                        tx.conn()
-                            .enqueue_benchmark_job(
-                                parent_sha,
-                                target,
-                                backend,
-                                profile,
-                                benchmark_set as u32,
-                            )
-                            .await?;
+                        if !has_emitted_parent_sha_error && !index.contains_tag(parent_sha) {
+                            log::error!("Parent tag; {parent_sha} does not exist in request benchmarks. Skipping");
+                            has_emitted_parent_sha_error = true;
+                        }
+
+                        if !has_emitted_parent_sha_error {
+                            tx.conn()
+                                .enqueue_benchmark_job(
+                                    parent_sha,
+                                    target,
+                                    backend,
+                                    profile,
+                                    benchmark_set as u32,
+                                )
+                                .await?;
+                        }
                     }
                 }
             }
@@ -267,6 +277,7 @@ pub async fn enqueue_benchmark_request(
 /// Returns benchmark requests that were completed.
 async fn process_benchmark_requests(
     conn: &mut dyn database::pool::Connection,
+    index: &BenchmarkRequestIndex,
 ) -> anyhow::Result<Vec<BenchmarkRequest>> {
     let queue = build_queue(conn).await?;
 
@@ -282,7 +293,7 @@ async fn process_benchmark_requests(
                 break;
             }
             BenchmarkRequestStatus::ArtifactsReady => {
-                enqueue_benchmark_request(conn, &request).await?;
+                enqueue_benchmark_request(conn, &request, index).await?;
                 break;
             }
             BenchmarkRequestStatus::WaitingForArtifacts
@@ -306,7 +317,7 @@ async fn cron_enqueue_jobs(ctxt: &SiteCtxt) -> anyhow::Result<()> {
     // Put the releases into the `benchmark_requests` queue
     requests_inserted |= create_benchmark_request_releases(&*conn, &index).await?;
     // Enqueue waiting requests and try to complete in-progress ones
-    let completed_reqs = process_benchmark_requests(&mut *conn).await?;
+    let completed_reqs = process_benchmark_requests(&mut *conn, &index).await?;
 
     // If some change happened, reload the benchmark request index
     if requests_inserted {