gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-24 13:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source 
Signed-off-by: junxiang Mu <1948535941@qq.com>
This commit is contained in:
junxiang Mu
2025-04-25 08:59:39 +00:00
parent 4613b36697
commit 8e3c22b595
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ecstore/src/heal/data_scanner.rs
+8 -6
View File
@@ -696,8 +696,8 @@ impl FolderScanner {
} }
} }
} }
if found_objects && *GLOBAL_IsErasure.read().await { // if found_objects && *GLOBAL_IsErasure.read().await {
// If we found an object in erasure mode, we skip subdirs (only datadirs)... if found_objects {
break 'outer; break 'outer;
} }
@@ -1029,11 +1029,13 @@ impl FolderScanner {
#[tracing::instrument(level = "info", skip(into, folder_scanner))] #[tracing::instrument(level = "info", skip(into, folder_scanner))]
async fn scan(folder: &CachedFolder, into: &mut DataUsageEntry, folder_scanner: &mut FolderScanner) { async fn scan(folder: &CachedFolder, into: &mut DataUsageEntry, folder_scanner: &mut FolderScanner) {
if into.compacted { let mut dst = if !into.compacted {
*into = DataUsageEntry::default(); DataUsageEntry::default()
} } else {
into.clone()
};
if Box::pin(folder_scanner.scan_folder(folder, into)).await.is_err() { if Box::pin(folder_scanner.scan_folder(folder, &mut dst)).await.is_err() {
return; return;
} }
if !into.compacted { if !into.compacted {
ecstore/src/heal/data_usage_cache.rs
+1 -5
View File
@@ -21,7 +21,7 @@ use tokio::time::sleep;
use tracing::warn; use tracing::warn;
use super::data_scanner::{SizeSummary, DATA_SCANNER_FORCE_COMPACT_AT_FOLDERS}; use super::data_scanner::{SizeSummary, DATA_SCANNER_FORCE_COMPACT_AT_FOLDERS};
use super::data_usage::{BucketTargetUsageInfo, BucketUsageInfo, DataUsageInfo, DATA_USAGE_ROOT}; use super::data_usage::{BucketTargetUsageInfo, BucketUsageInfo, DataUsageInfo};
// DATA_USAGE_BUCKET_LEN must be length of ObjectsHistogramIntervals // DATA_USAGE_BUCKET_LEN must be length of ObjectsHistogramIntervals
pub const DATA_USAGE_BUCKET_LEN: usize = 11; pub const DATA_USAGE_BUCKET_LEN: usize = 11;
@@ -858,9 +858,5 @@ impl DataUsageHash {
} }
pub fn hash_path(data: &str) -> DataUsageHash { pub fn hash_path(data: &str) -> DataUsageHash {
let mut data = data;
if data != DATA_USAGE_ROOT {
data = data.trim_matches('/');
}
DataUsageHash(Path::new(&data).clean().to_string_lossy().to_string()) DataUsageHash(Path::new(&data).clean().to_string_lossy().to_string())
} }