From ae6eacd7e3c07a17a2b76b10ead321db841177ca Mon Sep 17 00:00:00 2001 From: evan slack <51209817+evanofslack@users.noreply.github.com> Date: Thu, 26 Feb 2026 00:03:36 -0500 Subject: [PATCH] fix(typo): change dang_ling to dangling (#1968) --- crates/ecstore/src/set_disk.rs | 32 ++++++++++++++-------------- crates/ecstore/src/set_disk/heal.rs | 10 ++++----- crates/ecstore/src/set_disk/write.rs | 4 ++-- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/crates/ecstore/src/set_disk.rs b/crates/ecstore/src/set_disk.rs index 40c88b3e5..8e91edbb0 100644 --- a/crates/ecstore/src/set_disk.rs +++ b/crates/ecstore/src/set_disk.rs @@ -900,7 +900,7 @@ impl StorageAPI for SetDisks { if err == DiskError::ErasureReadQuorum && !src_bucket.starts_with(RUSTFS_META_BUCKET) && self - .delete_if_dang_ling(src_bucket, src_object, &metas, &errs, &HashMap::new(), src_opts.clone()) + .delete_if_dangling(src_bucket, src_object, &metas, &errs, &HashMap::new(), src_opts.clone()) .await .is_ok() { @@ -1529,7 +1529,7 @@ impl StorageAPI for SetDisks { if err == DiskError::ErasureReadQuorum && !bucket.starts_with(RUSTFS_META_BUCKET) && self - .delete_if_dang_ling(bucket, object, &metas, &errs, &HashMap::new(), opts.clone()) + .delete_if_dangling(bucket, object, &metas, &errs, &HashMap::new(), opts.clone()) .await .is_ok() { @@ -3052,17 +3052,17 @@ pub struct HealEntryResult { pub name: String, } -fn is_object_dang_ling( +fn is_object_dangling( meta_arr: &[FileInfo], errs: &[Option], data_errs_by_part: &HashMap>, ) -> (FileInfo, bool) { - let (not_found_meta_errs, non_actionable_meta_errs) = dang_ling_meta_errs_count(errs); + let (not_found_meta_errs, non_actionable_meta_errs) = dangling_meta_errs_count(errs); let (mut not_found_parts_errs, mut non_actionable_parts_errs) = (0, 0); data_errs_by_part.iter().for_each(|(_, v)| { - let (nf, na) = dang_ling_part_errs_count(v); + let (nf, na) = dangling_part_errs_count(v); if nf > not_found_parts_errs { (not_found_parts_errs, non_actionable_parts_errs) = (nf, na); } @@ -3106,7 +3106,7 @@ fn is_object_dang_ling( (valid_meta, false) } -fn dang_ling_meta_errs_count(cerrs: &[Option]) -> (usize, usize) { +fn dangling_meta_errs_count(cerrs: &[Option]) -> (usize, usize) { let (mut not_found_count, mut non_actionable_count) = (0, 0); cerrs.iter().for_each(|err| { if let Some(err) = err { @@ -3121,7 +3121,7 @@ fn dang_ling_meta_errs_count(cerrs: &[Option]) -> (usize, usize) { (not_found_count, non_actionable_count) } -fn dang_ling_part_errs_count(results: &[usize]) -> (usize, usize) { +fn dangling_part_errs_count(results: &[usize]) -> (usize, usize) { let (mut not_found_count, mut non_actionable_count) = (0, 0); results.iter().for_each(|result| { if *result == CHECK_PART_SUCCESS { @@ -3136,7 +3136,7 @@ fn dang_ling_part_errs_count(results: &[usize]) -> (usize, usize) { (not_found_count, non_actionable_count) } -fn is_object_dir_dang_ling(errs: &[Option]) -> bool { +fn is_object_dir_dangling(errs: &[Option]) -> bool { let mut found = 0; let mut not_found = 0; let mut found_not_empty = 0; @@ -4014,33 +4014,33 @@ mod tests { } #[test] - fn test_dang_ling_meta_errs_count() { + fn test_dangling_meta_errs_count() { // Test counting dangling metadata errors let errs = vec![None, Some(DiskError::FileNotFound), None]; - let (not_found_count, non_actionable_count) = dang_ling_meta_errs_count(&errs); + let (not_found_count, non_actionable_count) = dangling_meta_errs_count(&errs); assert_eq!(not_found_count, 1); // One FileNotFound error assert_eq!(non_actionable_count, 0); // No other errors } #[test] - fn test_dang_ling_part_errs_count() { + fn test_dangling_part_errs_count() { // Test counting dangling part errors let results = vec![CHECK_PART_SUCCESS, CHECK_PART_FILE_NOT_FOUND, CHECK_PART_SUCCESS]; - let (not_found_count, non_actionable_count) = dang_ling_part_errs_count(&results); + let (not_found_count, non_actionable_count) = dangling_part_errs_count(&results); assert_eq!(not_found_count, 1); // One FILE_NOT_FOUND error assert_eq!(non_actionable_count, 0); // No other errors } #[test] - fn test_is_object_dir_dang_ling() { + fn test_is_object_dir_dangling() { // Test object directory dangling detection let errs = vec![Some(DiskError::FileNotFound), Some(DiskError::FileNotFound), None]; - assert!(is_object_dir_dang_ling(&errs)); + assert!(is_object_dir_dangling(&errs)); let errs2 = vec![None, None, None]; - assert!(!is_object_dir_dang_ling(&errs2)); + assert!(!is_object_dir_dangling(&errs2)); let errs3 = vec![Some(DiskError::FileCorrupt), Some(DiskError::FileNotFound)]; - assert!(!is_object_dir_dang_ling(&errs3)); // Mixed errors, not all not found + assert!(!is_object_dir_dangling(&errs3)); // Mixed errors, not all not found } #[test] diff --git a/crates/ecstore/src/set_disk/heal.rs b/crates/ecstore/src/set_disk/heal.rs index 90038def3..aa973a80f 100644 --- a/crates/ecstore/src/set_disk/heal.rs +++ b/crates/ecstore/src/set_disk/heal.rs @@ -226,7 +226,7 @@ impl SetDisks { // Allow for dangling deletes, on versions that have DataDir missing etc. // this would end up restoring the correct readable versions. return match self - .delete_if_dang_ling( + .delete_if_dangling( bucket, object, &parts_metadata, @@ -548,7 +548,7 @@ impl SetDisks { Err(err) => { let data_errs_by_part = HashMap::new(); match self - .delete_if_dang_ling( + .delete_if_dangling( bucket, object, &parts_metadata, @@ -605,8 +605,8 @@ impl SetDisks { result.after.drives = vec![HealDriveInfo::default(); disks.len()]; let errs = stat_all_dirs(&disks, bucket, object).await; - let dang_ling_object = is_object_dir_dang_ling(&errs); - if dang_ling_object && !dry_run && remove { + let dangling_object = is_object_dir_dangling(&errs); + if dangling_object && !dry_run && remove { let mut futures = Vec::with_capacity(disks.len()); for disk in disks.iter().flatten() { let disk = disk.clone(); @@ -654,7 +654,7 @@ impl SetDisks { }); } - if dang_ling_object || DiskError::is_all_not_found(&errs) { + if dangling_object || DiskError::is_all_not_found(&errs) { return Ok((result, Some(DiskError::FileNotFound))); } diff --git a/crates/ecstore/src/set_disk/write.rs b/crates/ecstore/src/set_disk/write.rs index f0a939bc4..d937ede3e 100644 --- a/crates/ecstore/src/set_disk/write.rs +++ b/crates/ecstore/src/set_disk/write.rs @@ -440,7 +440,7 @@ impl SetDisks { Ok(()) } - pub(super) async fn delete_if_dang_ling( + pub(super) async fn delete_if_dangling( &self, bucket: &str, object: &str, @@ -449,7 +449,7 @@ impl SetDisks { data_errs_by_part: &HashMap>, opts: ObjectOptions, ) -> disk::error::Result { - let (m, can_heal) = is_object_dang_ling(meta_arr, errs, data_errs_by_part); + let (m, can_heal) = is_object_dangling(meta_arr, errs, data_errs_by_part); if !can_heal { return Err(DiskError::ErasureReadQuorum);