Separate try benchmark requests for the old and new system and test the new system on a specific PR

Author: Kobzol

site/src/github.rs

@@ -2,7 +2,7 @@ pub mod client;
 pub mod comparison_summary;
 
 use crate::api::github::Commit;
-use crate::job_queue::run_new_queue;
+use crate::job_queue::{run_new_queue, should_use_new_system};
 use crate::load::{MissingReason, SiteCtxt, TryCommit};
 use chrono::{DateTime, Utc};
 use serde::Deserialize;
@@ -240,18 +240,16 @@ async fn attach_shas_to_try_benchmark_request(
     commit: &TryCommit,
     commit_date: DateTime<Utc>,
 ) {
-    if run_new_queue() {
-        if let Err(e) = conn
-            .attach_shas_to_try_benchmark_request(
-                pr_number,
-                &commit.sha,
-                &commit.parent_sha,
-                commit_date,
-            )
-            .await
-        {
-            log::error!("Failed to add shas to try commit: {e:?}");
-        }
+    if let Err(e) = conn
+        .attach_shas_to_try_benchmark_request(
+            pr_number,
+            &commit.sha,
+            &commit.parent_sha,
+            commit_date,
+        )
+        .await
+    {
+        log::error!("Failed to add shas to try commit: {e:?}");
     }
 }
 
@@ -281,22 +279,24 @@ pub async fn enqueue_shas(
         };
         let conn = ctxt.conn().await;
 
-        attach_shas_to_try_benchmark_request(
-            &*conn,
-            pr_number,
-            &try_commit,
-            commit_response.commit.committer.date,
-        )
-        .await;
-
-        let queued = conn
-            .pr_attach_commit(
+        let queued = if should_use_new_system(pr_number) {
+            attach_shas_to_try_benchmark_request(
+                &*conn,
+                pr_number,
+                &try_commit,
+                commit_response.commit.committer.date,
+            )
+            .await;
+            true
+        } else {
+            conn.pr_attach_commit(
                 pr_number,
                 &try_commit.sha,
                 &try_commit.parent_sha,
                 Some(commit_response.commit.committer.date),
             )
-            .await;
+            .await
+        };
         if queued {
             if !msg.is_empty() {
                 msg.push('\n');

site/src/job_queue/mod.rs

@@ -20,6 +20,13 @@ pub fn run_new_queue() -> bool {
         .unwrap_or(false)
 }
 
+/// rust-lang/rust PR that will be used for testing the new system.
+const TEST_PR_FOR_NEW_SYSTEM: u32 = 147039;
+
+pub fn should_use_new_system(pr: u32) -> bool {
+    run_new_queue() && pr == TEST_PR_FOR_NEW_SYSTEM
+}
+
 /// Store the latest master commits or do nothing if all of them are
 /// already in the database.
 /// Returns `true` if at least one benchmark request was inserted.

site/src/request_handlers/github.rs

@@ -3,7 +3,7 @@ use crate::github::{
     client, enqueue_shas, parse_homu_comment, rollup_pr_number, unroll_rollup,
     COMMENT_MARK_TEMPORARY, RUST_REPO_GITHUB_API_URL,
 };
-use crate::job_queue::run_new_queue;
+use crate::job_queue::{run_new_queue, should_use_new_system};
 use crate::load::SiteCtxt;
 
 use database::BenchmarkRequest;
@@ -84,13 +84,10 @@ async fn record_try_benchmark_request_without_artifacts(
     pr: u32,
     backends: &str,
 ) {
-    // We only want to run this if the new system is running
-    if run_new_queue() {
-        let try_request = BenchmarkRequest::create_try_without_artifacts(pr, backends, "");
-        log::info!("Inserting try benchmark request {try_request:?}");
-        if let Err(e) = conn.insert_benchmark_request(&try_request).await {
-            log::error!("Failed to insert try benchmark request: {}", e);
-        }
+    let try_request = BenchmarkRequest::create_try_without_artifacts(pr, backends, "");
+    log::info!("Inserting try benchmark request {try_request:?}");
+    if let Err(e) = conn.insert_benchmark_request(&try_request).await {
+        log::error!("Failed to insert try benchmark request: {}", e);
     }
 }
 
@@ -120,20 +117,23 @@ async fn handle_rust_timer(
             Ok(cmd) => {
                 let conn = ctxt.conn().await;
 
-                record_try_benchmark_request_without_artifacts(
-                    &*conn,
-                    issue.number,
-                    cmd.params.backends.unwrap_or(""),
-                )
-                .await;
-                conn.queue_pr(
-                    issue.number,
-                    cmd.params.include,
-                    cmd.params.exclude,
-                    cmd.params.runs,
-                    cmd.params.backends,
-                )
-                .await;
+                if should_use_new_system(issue.number) {
+                    record_try_benchmark_request_without_artifacts(
+                        &*conn,
+                        issue.number,
+                        cmd.params.backends.unwrap_or(""),
+                    )
+                    .await;
+                } else {
+                    conn.queue_pr(
+                        issue.number,
+                        cmd.params.include,
+                        cmd.params.exclude,
+                        cmd.params.runs,
+                        cmd.params.backends,
+                    )
+                    .await;
+                }
                 format!(
                     "Awaiting bors try build completion.
 
@@ -166,20 +166,23 @@ async fn handle_rust_timer(
     {
         let conn = ctxt.conn().await;
         for command in &valid_build_cmds {
-            record_try_benchmark_request_without_artifacts(
-                &*conn,
-                issue.number,
-                command.params.backends.unwrap_or(""),
-            )
-            .await;
-            conn.queue_pr(
-                issue.number,
-                command.params.include,
-                command.params.exclude,
-                command.params.runs,
-                command.params.backends,
-            )
-            .await;
+            if should_use_new_system(issue.number) {
+                record_try_benchmark_request_without_artifacts(
+                    &*conn,
+                    issue.number,
+                    command.params.backends.unwrap_or(""),
+                )
+                .await;
+            } else {
+                conn.queue_pr(
+                    issue.number,
+                    command.params.include,
+                    command.params.exclude,
+                    command.params.runs,
+                    command.params.backends,
+                )
+                .await;
+            }
         }
     }