Garmelon/tablejohn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow worker to specify bench method as string

Browse source
This commit is contained in:
Joscha 2023-08-14 16:47:00 +02:00
parent 3de35e3ac8
commit 1ec72c92d5
6 changed files with 67 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/server/web/api/worker.rs
View file

@ -32,7 +32,7 @@ use crate::{
};
async fn save_work(
finished: FinishedRun,
run: FinishedRun,
worker_name: &str,
worker_info: &Option<String>,
db: &SqlitePool,
@ -40,15 +40,7 @@ async fn save_work(
let mut tx = db.begin().await?;
let conn = tx.acquire().await?;
let end = finished
.end
.map(|t| t.0)
.unwrap_or_else(OffsetDateTime::now_utc);
let bench_method = match finished.run.bench_method {
BenchMethod::Internal => "internal".to_string(),
BenchMethod::Repo { hash } => format!("bench repo, hash {hash}"),
};
let end = run.end.map(|t| t.0).unwrap_or_else(OffsetDateTime::now_utc);
sqlx::query!(
"\
@ -64,19 +56,19 @@ async fn save_work(
) \
VALUES (?, ?, ?, ?, ?, ?, ?, ?) \
",
finished.run.id,
finished.run.hash,
bench_method,
run.id,
run.hash,
run.bench_method,
worker_name,
worker_info,
finished.run.start.0,
run.start.0,
end,
finished.exit_code,
run.exit_code,
)
.execute(&mut *conn)
.await?;
for (name, measurement) in finished.measurements {
for (name, measurement) in run.measurements {
sqlx::query!(
"\
INSERT INTO run_measurements ( \
@ -89,7 +81,7 @@ async fn save_work(
) \
VALUES (?, ?, ?, ?, ?, ?) \
",
finished.run.id,
run.id,
name,
measurement.value,
measurement.stddev,
@ -100,7 +92,7 @@ async fn save_work(
.await?;
}
for (idx, (source, text)) in finished.output.into_iter().enumerate() {
for (idx, (source, text)) in run.output.into_iter().enumerate() {
// Hopefully we won't need more than 4294967296 output chunks per run :P
let idx = idx as u32;
sqlx::query!(
@ -113,7 +105,7 @@ async fn save_work(
) \
VALUES (?, ?, ?, ?) \
",
finished.run.id,
run.id,
idx,
source,
text,
@ -123,7 +115,7 @@ async fn save_work(
}
// The thing has been done :D
sqlx::query!("DELETE FROM queue WHERE hash = ?", finished.run.hash)
sqlx::query!("DELETE FROM queue WHERE hash = ?", run.hash)
.execute(&mut *conn)
.await?;

23
src/server/web/pages/queue.rs
View file

@ -76,19 +76,12 @@ async fn get_workers(
let status = match &info.status {
WorkerStatus::Idle => Status::Idle,
WorkerStatus::Busy => Status::Busy,
WorkerStatus::Working(unfinished) => {
let message = sqlx::query_scalar!(
"SELECT message FROM commits WHERE hash = ?",
unfinished.run.hash
)
.fetch_one(db)
.await?;
Status::Working(LinkRunShort::new(
base,
unfinished.run.id.clone(),
&unfinished.run.hash,
&message,
))
WorkerStatus::Working(run) => {
let message =
sqlx::query_scalar!("SELECT message FROM commits WHERE hash = ?", run.hash)
.fetch_one(db)
.await?;
Status::Working(LinkRunShort::new(base, run.id.clone(), &run.hash, &message))
}
};
@ -108,9 +101,9 @@ async fn get_queue_data(
// Group workers by commit hash
let mut workers_by_commit: HashMap<String, Vec<LinkWorker>> = HashMap::new();
for (name, info) in workers {
if let WorkerStatus::Working(unfinished) = &info.status {
if let WorkerStatus::Working(run) = &info.status {
workers_by_commit
.entry(unfinished.run.hash.clone())
.entry(run.hash.clone())
.or_default()
.push(LinkWorker::new(base, name.clone()));
}

21
src/server/web/pages/worker.rs
View file

@ -43,21 +43,14 @@ async fn status(status: &WorkerStatus, db: &SqlitePool, base: &Base) -> somehow:
Ok(match status {
WorkerStatus::Idle => Status::Idle,
WorkerStatus::Busy => Status::Busy,
WorkerStatus::Working(unfinished) => {
let message = sqlx::query_scalar!(
"SELECT message FROM commits WHERE hash = ?",
unfinished.run.hash
)
.fetch_one(db)
.await?;
WorkerStatus::Working(run) => {
let message =
sqlx::query_scalar!("SELECT message FROM commits WHERE hash = ?", run.hash)
.fetch_one(db)
.await?;
Status::Working {
link: LinkRunShort::new(
base,
unfinished.run.id.clone(),
&unfinished.run.hash,
&message,
),
since: util::format_time(unfinished.run.start.0),
link: LinkRunShort::new(base, run.id.clone(), &run.hash, &message),
since: util::format_time(run.start.0),
}
}
})