Skip to content

Commit 98dee6d

Browse files
committed
Enable the job queue by default
1 parent 2192993 commit 98dee6d

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

site/src/github.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pub mod client;
22
pub mod comparison_summary;
33

44
use crate::api::github::Commit;
5-
use crate::job_queue::should_use_new_system;
5+
use crate::job_queue::should_use_job_queue;
66
use crate::load::{MissingReason, SiteCtxt, TryCommit};
77
use chrono::{DateTime, Utc};
88
use serde::Deserialize;
@@ -279,7 +279,7 @@ pub async fn enqueue_shas(
279279
};
280280
let conn = ctxt.conn().await;
281281

282-
let queued = if should_use_new_system(pr_number) {
282+
let queued = if should_use_job_queue(pr_number) {
283283
attach_shas_to_try_benchmark_request(
284284
&*conn,
285285
pr_number,

site/src/job_queue/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ use parking_lot::RwLock;
1313
use std::{str::FromStr, sync::Arc};
1414
use tokio::time::{self, Duration, MissedTickBehavior};
1515

16-
pub fn run_new_queue() -> bool {
17-
std::env::var("RUN_CRON")
16+
pub fn is_job_queue_enabled() -> bool {
17+
std::env::var("USE_JOB_QUEUE")
1818
.ok()
1919
.and_then(|x| x.parse().ok())
20-
.unwrap_or(false)
20+
.unwrap_or(true)
2121
}
2222

23-
/// rust-lang/rust PR that will be used for testing the new system.
24-
const TEST_PR_FOR_NEW_SYSTEM: u32 = 147039;
23+
/// rust-lang/rust PR that will be used for testing the job queue.
24+
const TEST_PR_FOR_JOB_QUEUE: u32 = 147039;
2525

26-
pub fn should_use_new_system(pr: u32) -> bool {
27-
run_new_queue() && pr == TEST_PR_FOR_NEW_SYSTEM
26+
pub fn should_use_job_queue(pr: u32) -> bool {
27+
is_job_queue_enabled() && pr == TEST_PR_FOR_JOB_QUEUE
2828
}
2929

3030
/// Store the latest master commits or do nothing if all of them are

site/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use futures::future::FutureExt;
22
use parking_lot::RwLock;
3-
use site::job_queue::{create_queue_process, run_new_queue};
3+
use site::job_queue::{create_queue_process, is_job_queue_enabled};
44
use site::load;
55
use std::env;
66
use std::sync::Arc;
@@ -59,7 +59,7 @@ async fn main() {
5959

6060
let server = site::server::start(ctxt.clone(), port).fuse();
6161

62-
if run_new_queue() {
62+
if is_job_queue_enabled() {
6363
task::spawn(async move {
6464
create_queue_process(
6565
ctxt.clone(),

site/src/request_handlers/github.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::github::{
33
client, enqueue_shas, parse_homu_comment, rollup_pr_number, unroll_rollup,
44
COMMENT_MARK_TEMPORARY, RUST_REPO_GITHUB_API_URL,
55
};
6-
use crate::job_queue::should_use_new_system;
6+
use crate::job_queue::should_use_job_queue;
77
use crate::load::SiteCtxt;
88

99
use database::BenchmarkRequest;
@@ -117,7 +117,7 @@ async fn handle_rust_timer(
117117
Ok(cmd) => {
118118
let conn = ctxt.conn().await;
119119

120-
if should_use_new_system(issue.number) {
120+
if should_use_job_queue(issue.number) {
121121
record_try_benchmark_request_without_artifacts(
122122
&*conn,
123123
issue.number,
@@ -166,7 +166,7 @@ async fn handle_rust_timer(
166166
{
167167
let conn = ctxt.conn().await;
168168
for command in &valid_build_cmds {
169-
if should_use_new_system(issue.number) {
169+
if should_use_job_queue(issue.number) {
170170
record_try_benchmark_request_without_artifacts(
171171
&*conn,
172172
issue.number,

0 commit comments

Comments
 (0)