From 52cd817bf0d065e930f7fe35d8ce876ef15f355c Mon Sep 17 00:00:00 2001 From: Jamie Pine Date: Wed, 3 Dec 2025 18:00:43 -0800 Subject: [PATCH] refactor: remove unnecessary file system operations --- core/src/domain/resource_manager.rs | 6 +++- core/tests/job_resumption_integration_test.rs | 28 +++++++++++-------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/core/src/domain/resource_manager.rs b/core/src/domain/resource_manager.rs index 9bf1635af..cedeb5c04 100644 --- a/core/src/domain/resource_manager.rs +++ b/core/src/domain/resource_manager.rs @@ -359,7 +359,11 @@ impl ResourceManager { e )) })?, - metadata: None, + metadata: Some(ResourceMetadata { + no_merge_fields: vec!["resolved_file".to_string()], + alternate_ids: vec![], + affected_paths: vec![], + }), }); } } diff --git a/core/tests/job_resumption_integration_test.rs b/core/tests/job_resumption_integration_test.rs index f8a1a9c03..7008257ef 100644 --- a/core/tests/job_resumption_integration_test.rs +++ b/core/tests/job_resumption_integration_test.rs @@ -206,19 +206,23 @@ async fn test_single_interruption_point( info!("Cleaning up database lock files..."); let library_dir = test_setup.data_dir().join("libraries"); if library_dir.exists() { - for entry in std::fs::read_dir(&library_dir)? { - let entry = entry?; - let path = entry.path(); - if path.is_dir() { - // Remove SQLite WAL and SHM files - let db_path = path.join("library.db"); - let wal_path = path.join("library.db-wal"); - let shm_path = path.join("library.db-shm"); + if let Ok(entries) = std::fs::read_dir(&library_dir) { + for entry in entries { + if let Ok(entry) = entry { + let path = entry.path(); + if path.is_dir() { + // Remove SQLite WAL and SHM files + let wal_path = path.join("library.db-wal"); + let shm_path = path.join("library.db-shm"); - for lock_file in [wal_path, shm_path] { - if lock_file.exists() { - if let Err(e) = std::fs::remove_file(&lock_file) { - warn!("Failed to remove {}: {}", lock_file.display(), e); + for lock_file in [wal_path, shm_path] { + if lock_file.exists() { + if let Err(e) = std::fs::remove_file(&lock_file) { + warn!("Failed to remove {}: {}", lock_file.display(), e); + } else { + info!("Removed lock file: {}", lock_file.display()); + } + } } } }