Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions site/src/job_queue/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use database::{
};
use parking_lot::RwLock;
use std::sync::Arc;
use std::time::Instant;
use tokio::time::{self, Duration, MissedTickBehavior};

/// Store the latest master commits or do nothing if all of them are
Expand Down Expand Up @@ -66,8 +67,9 @@ async fn create_benchmark_request_master_commits(
/// Returns `true` if at least one benchmark request was inserted.
async fn create_benchmark_request_releases(
conn: &dyn database::pool::Connection,
index: &BenchmarkRequestIndex,
) -> anyhow::Result<()> {
log::info!("Checking released artifacts");

let releases: String = reqwest::get("https://static.rust-lang.org/manifests.txt")
.await?
.text()
Expand All @@ -80,23 +82,20 @@ async fn create_benchmark_request_releases(
.take(20);

for (name, commit_date) in releases {
if !index.contains_tag(&name) && conn.artifact_by_name(&name).await.is_none() {
let release_request = BenchmarkRequest::create_release(&name, commit_date);
log::info!("Inserting release benchmark request {release_request:?}");

match conn.insert_benchmark_request(&release_request).await {
Ok(BenchmarkRequestInsertResult::NothingInserted) => {
log::error!(
"Failed to insert release benchmark request, release with tag `{name}` already exists"
);
}
Ok(BenchmarkRequestInsertResult::Inserted) => {}
Err(e) => {
log::error!("Failed to insert release benchmark request: {e}");
}
let release_request = BenchmarkRequest::create_release(&name, commit_date);
match conn.insert_benchmark_request(&release_request).await {
Ok(BenchmarkRequestInsertResult::NothingInserted) => {
// Artifact is already recorded in the DB
}
Ok(BenchmarkRequestInsertResult::Inserted) => {
log::info!("Inserted release benchmark request {release_request:?}");
}
Err(e) => {
log::error!("Failed to insert release benchmark request: {e}");
}
}
}
log::info!("Finished checking released artifacts");
Ok(())
}

Expand Down Expand Up @@ -461,17 +460,22 @@ async fn perform_queue_tick(ctxt: &SiteCtxt) -> anyhow::Result<()> {
return Ok(());
}

let start = Instant::now();
let index = conn
.load_benchmark_request_index()
.await
.context("Failed to load benchmark request index")?;
log::info!(
"Loading the benchmark request index took {}s",
start.elapsed().as_secs_f64()
);

// Put the master commits into the `benchmark_requests` queue
if let Err(error) = create_benchmark_request_master_commits(ctxt, &*conn, &index).await {
log::error!("Could not insert master benchmark requests into the database: {error:?}");
}
// Put the releases into the `benchmark_requests` queue
if let Err(error) = create_benchmark_request_releases(&*conn, &index).await {
if let Err(error) = create_benchmark_request_releases(&*conn).await {
log::error!("Could not insert release benchmark requests into the database: {error:?}");
}

Expand Down
2 changes: 1 addition & 1 deletion site/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;

#[tokio::main]
async fn main() {
env_logger::init();
env_logger::builder().format_timestamp_millis().init();

#[cfg(unix)]
let _ = jemalloc_ctl::background_thread::write(true);
Expand Down
Loading