Notify the scheduler when a failed job completes. See crossbeam-rs#477

exrook · Aug 1, 2019 · f988cf9 · f988cf9
1 parent 6ba6f6c
commit f988cf9
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/bin/sccache-dist/main.rs b/src/bin/sccache-dist/main.rs
@@ -792,20 +792,21 @@ impl ServerIncoming for Server {
         requester
             .do_update_job_state(job_id, JobState::Started)
             .chain_err(|| "Updating job state failed")?;
-        let tc = match self.job_toolchains.lock().unwrap().remove(&job_id) {
-            Some(tc) => tc,
-            None => return Ok(RunJobResult::JobNotFound),
+        let res = match self.job_toolchains.lock().unwrap().remove(&job_id) {
+            None => Ok(RunJobResult::JobNotFound),
+            Some(tc) => {
+                match self.builder.run_build(tc, command, outputs, inputs_rdr, &self.cache) {
+                    Err(e) => Err(e.chain_err(|| "run build failed")),
+                    Ok(res) => Ok(RunJobResult::Complete(JobComplete {
+                        output: res.output,
+                        outputs: res.outputs,
+                    })),
+                }
+            },
         };
-        let res = self
-            .builder
-            .run_build(tc, command, outputs, inputs_rdr, &self.cache)
-            .chain_err(|| "run build failed")?;
         requester
             .do_update_job_state(job_id, JobState::Complete)
             .chain_err(|| "Updating job state failed")?;
-        Ok(RunJobResult::Complete(JobComplete {
-            output: res.output,
-            outputs: res.outputs,
-        }))
+        return res;
     }
 }