diff --git a/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/download_static_dependencies.rs b/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/download_static_dependencies.rs index 10a529a897..f0b3d2a0cd 100644 --- a/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/download_static_dependencies.rs +++ b/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/download_static_dependencies.rs @@ -39,7 +39,7 @@ pub async fn download_static_dependencies<'a>( &mut job_progress_reporter, "downloading vocoder (1 of 3)", job.id.0, - &job_dependencies.fs.scoped_temp_dir_creator_for_short_lived_downloads, + &job_dependencies.fs.scoped_temp_dir_creator_for_long_lived_downloads, ).await?; waveglow_vocoder_model_fs_path @@ -61,7 +61,7 @@ pub async fn download_static_dependencies<'a>( &mut job_progress_reporter, "downloading vocoder (2 of 3)", job.id.0, - &job_dependencies.fs.scoped_temp_dir_creator_for_short_lived_downloads, + &job_dependencies.fs.scoped_temp_dir_creator_for_long_lived_downloads, ).await?; hifigan_vocoder_model_fs_path @@ -83,7 +83,7 @@ pub async fn download_static_dependencies<'a>( &mut job_progress_reporter, "downloading vocoder (3 of 3)", job.id.0, - &job_dependencies.fs.scoped_temp_dir_creator_for_short_lived_downloads, + &job_dependencies.fs.scoped_temp_dir_creator_for_long_lived_downloads, ).await?; hifigan_superres_vocoder_model_fs_path diff --git a/crates/service/job/inference_job/src/main.rs b/crates/service/job/inference_job/src/main.rs index d7dc736356..3cd39e5e90 100644 --- a/crates/service/job/inference_job/src/main.rs +++ b/crates/service/job/inference_job/src/main.rs @@ -119,20 +119,10 @@ async fn main() -> AnyhowResult<()> { )?; // Where we download models and resources to (typically a shared NFS volume in prod). - let temp_directory_downloads = easyenv::get_env_pathbuf_or_default( - "TEMP_DIR_DOWNLOADS", - PathBuf::from("/tmp/downloads") - ); - // //// Where we store scratch files for workloads (temporary processing). - // let temp_directory_work = easyenv::get_env_pathbuf_or_default( - // "TEMP_DIR_WORK", - // PathBuf::from("/tmp/work") - // ); - - - let semi_persistent_cache = - SemiPersistentCacheDir::configured_root(&temp_directory_downloads); + let semi_persistent_cache = SemiPersistentCacheDir::configured_root( + easyenv::get_env_pathbuf_or_default("SEMI_PERSISTENT_DIR_ROOT", + PathBuf::from("/tmp/persistent"))); let db_connection_string = easyenv::get_env_string_or_default( diff --git a/crates/service/job/inference_job/src/util/maybe_download_file_from_bucket.rs b/crates/service/job/inference_job/src/util/maybe_download_file_from_bucket.rs index bd294c51cb..98a49512ca 100644 --- a/crates/service/job/inference_job/src/util/maybe_download_file_from_bucket.rs +++ b/crates/service/job/inference_job/src/util/maybe_download_file_from_bucket.rs @@ -13,7 +13,7 @@ use crate::util::scoped_temp_dir_creator::ScopedTempDirCreator; pub async fn maybe_download_file_from_bucket( name_or_description_of_file: &str, - file_path: &Path, + final_filesystem_file_path: &Path, bucket_object_path: &Path, bucket_client: &BucketClient, job_progress_reporter: &mut Box, @@ -22,12 +22,12 @@ pub async fn maybe_download_file_from_bucket( scoped_tempdir_creator: &ScopedTempDirCreator, ) -> Result<(), ProcessSingleJobError> { - if file_path.exists() { + if final_filesystem_file_path.exists() { // TODO(bt, 2022-07-15): Check signature of file return Ok(()) } - warn!("{} does not exist at path: {:?}", name_or_description_of_file, &file_path); + warn!("{} does not exist at path: {:?}", name_or_description_of_file, &final_filesystem_file_path); job_progress_reporter.log_status(job_progress_update_description) .map_err(|e| ProcessSingleJobError::Other(e))?; @@ -54,15 +54,15 @@ pub async fn maybe_download_file_from_bucket( info!("Downloaded {} from bucket!", name_or_description_of_file); info!("Renaming {} temp file from {:?} to {:?}!", - name_or_description_of_file, &temp_path, &file_path); + name_or_description_of_file, &temp_path, &final_filesystem_file_path); - std::fs::rename(&temp_path, &file_path) + std::fs::rename(&temp_path, &final_filesystem_file_path) .map_err(|e| { safe_delete_temp_directory(&temp_dir); ProcessSingleJobError::from_io_error(e) })?; - info!("Finished downloading {} file to {:?}", name_or_description_of_file, &file_path); + info!("Finished downloading {} file to {:?}", name_or_description_of_file, &final_filesystem_file_path); safe_delete_temp_directory(&temp_dir);