From 1ca54927d70df6913c562d05bec527a355fc0a20 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Fri, 21 Oct 2022 03:19:28 -0400 Subject: [PATCH] fix compile errors --- .../tts_inference_job/src/job_steps/job_stats.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/crates/service/tts_inference_job/src/job_steps/job_stats.rs b/crates/service/tts_inference_job/src/job_steps/job_stats.rs index fe006d0b60..5c38410b71 100644 --- a/crates/service/tts_inference_job/src/job_steps/job_stats.rs +++ b/crates/service/tts_inference_job/src/job_steps/job_stats.rs @@ -1,5 +1,5 @@ -use std::sync::{Arc, LockResult, RwLock}; -use log::error; +use std::sync::{Arc, RwLock}; +use anyhow::anyhow; use container_common::anyhow_result::AnyhowResult; /// Job stats uses interior mutability to be easy to copy around. @@ -34,7 +34,9 @@ impl JobStats { } pub fn increment_failure_count(&self) -> AnyhowResult { - let mut lock = self.inner.write()?; + // NB: lock errors can't be moved between threads, so we change their type + let mut lock = self.inner.write() + .map_err(|e| anyhow!("lock error: {:?}", e))?; lock.total_failure_count = lock.total_failure_count.saturating_add(1); lock.consecutive_success_count = 0; @@ -49,7 +51,9 @@ impl JobStats { } pub fn increment_success_count(&self) -> AnyhowResult { - let mut lock = self.inner.write()?; + // NB: lock errors can't be moved between threads, so we change their type + let mut lock = self.inner.write() + .map_err(|e| anyhow!("lock error: {:?}", e))?; lock.total_success_count = lock.total_success_count.saturating_add(1); lock.consecutive_success_count = lock.consecutive_success_count.saturating_add(1);