Skip to content

Commit 85f618e

Browse files
committed
Do not warn if a step is ended multiple times
1 parent 2f1ecf8 commit 85f618e

File tree

3 files changed

+8
-22
lines changed

3 files changed

+8
-22
lines changed

collector/src/lib.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -354,13 +354,9 @@ pub struct CollectorCtx {
354354
}
355355

356356
impl CollectorCtx {
357-
pub async fn start_compile_step(
358-
&self,
359-
conn: &dyn Connection,
360-
benchmark_name: &BenchmarkName,
361-
) -> bool {
357+
pub async fn start_compile_step(&self, conn: &dyn Connection, benchmark_name: &BenchmarkName) {
362358
conn.collector_start_step(self.artifact_row_id, &benchmark_name.0)
363-
.await
359+
.await;
364360
}
365361

366362
pub async fn end_compile_step(&self, conn: &dyn Connection, benchmark_name: &BenchmarkName) {

database/src/pool/postgres.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,19 +1176,14 @@ where
11761176
== 1
11771177
}
11781178
async fn collector_end_step(&self, aid: ArtifactIdNumber, step: &str) {
1179-
let did_modify = self
1180-
.conn()
1179+
self.conn()
11811180
.execute(
11821181
"update collector_progress set end_time = statement_timestamp() \
1183-
where aid = $1 and step = $2 and start_time is not null and end_time is null;",
1182+
where aid = $1 and step = $2 and start_time is not null;",
11841183
&[&(aid.0 as i32), &step],
11851184
)
11861185
.await
1187-
.unwrap()
1188-
== 1;
1189-
if !did_modify {
1190-
log::error!("did not end {} for {:?}", step, aid);
1191-
}
1186+
.unwrap();
11921187
}
11931188
async fn collector_remove_step(&self, aid: ArtifactIdNumber, step: &str) {
11941189
self.conn()

database/src/pool/sqlite.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,18 +1062,13 @@ impl Connection for SqliteConnection {
10621062
}
10631063

10641064
async fn collector_end_step(&self, aid: ArtifactIdNumber, step: &str) {
1065-
let did_modify = self
1066-
.raw_ref()
1065+
self.raw_ref()
10671066
.execute(
10681067
"update collector_progress set end = strftime('%s','now') \
1069-
where aid = ? and step = ? and start is not null and end is null;",
1068+
where aid = ? and step = ? and start is not null;",
10701069
params![&aid.0, &step],
10711070
)
1072-
.unwrap()
1073-
== 1;
1074-
if !did_modify {
1075-
log::error!("did not end {} for {:?}", step, aid);
1076-
}
1071+
.unwrap();
10771072
}
10781073

10791074
async fn collector_remove_step(&self, aid: ArtifactIdNumber, step: &str) {

0 commit comments

Comments
 (0)