Merge pull request #348 from rustfs/fix-data-scan

fix
This commit is contained in:
guojidan
2025-04-23 16:28:12 +08:00
committed by GitHub
2 changed files with 5 additions and 7 deletions

View File

@@ -1029,13 +1029,11 @@ impl FolderScanner {
#[tracing::instrument(level = "info", skip(into, folder_scanner))]
async fn scan(folder: &CachedFolder, into: &mut DataUsageEntry, folder_scanner: &mut FolderScanner) {
let mut dst = if into.compacted {
DataUsageEntry::default()
} else {
into.clone()
};
if !into.compacted {
*into = DataUsageEntry::default();
}
if Box::pin(folder_scanner.scan_folder(folder, &mut dst)).await.is_err() {
if Box::pin(folder_scanner.scan_folder(folder, into)).await.is_err() {
return;
}
if !into.compacted {

View File

@@ -541,7 +541,7 @@ impl DataUsageCache {
match self.find(path) {
Some(root) => {
if root.children.is_empty() {
return None;
return Some(root);
}
let mut flat = self.flatten(&root);
if flat.replication_stats.is_some() && flat.replication_stats.as_ref().unwrap().empty() {