Skip to content

Commit 4c79626

Browse files
Revert "Report errors during crate preparation in collector"
This caused a bug in production, since panicking in the collection loop takes down the collector before it can save the faulty status to the DB. For now just revert the commit, we'll want to rethink the approach of panicking here. This reverts commit d7dc01c.
1 parent 7ed2817 commit 4c79626

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

collector/src/benchmark/mod.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,18 +253,15 @@ impl Benchmark {
253253
for (profile, prep_dir) in &profile_dirs {
254254
let server = server.clone();
255255
s.spawn::<_, anyhow::Result<()>>(move |_| {
256-
// Panic the thread if an error occurs to make sure that the whole scope will
257-
// also panic if there was some error.
258256
self.mk_cargo_process(compiler, prep_dir.path(), *profile)
259257
.jobserver(server)
260-
.run_rustc(false)
261-
.unwrap();
258+
.run_rustc(false)?;
262259
Ok(())
263260
});
264261
}
265262
Ok(())
266263
})
267-
.expect("Preparation has failed")?;
264+
.unwrap()?;
268265

269266
for (profile, prep_dir) in profile_dirs {
270267
eprintln!("Running {}: {:?} + {:?}", self.name, profile, scenarios);

0 commit comments

Comments
 (0)