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

style: format usage freshness changes

Browse Source
This commit is contained in:
马登山
2026-08-23 10:28:47 +08:00
parent 5496e14960
commit 307510749e
7 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/scanner/src/scanner_io/cache.rs
+4 -1
View File
@@ -353,7 +353,10 @@ pub(super) fn observational_data_usage_info(
objects_total_size: u64::try_from(total.size).ok()?,
tier_stats: total.all_tier_stats.filter(|tiers| !tiers.is_empty()),
buckets_count: u64::try_from(buckets_usage.len()).ok()?,
bucket_sizes: buckets_usage.iter().map(|(bucket, usage)| (bucket.clone(), usage.size)).collect(),
bucket_sizes: buckets_usage
.iter()
.map(|(bucket, usage)| (bucket.clone(), usage.size))
.collect(),
buckets_usage,
usage_snapshot_complete: false,
usage_snapshot_partial: true,
crates/scanner/src/scanner_io/io_cache.rs
+2 -6
View File
@@ -112,9 +112,7 @@ impl ScannerIOCache for SetDisks {
incomplete_scope.info.lkg_leader_epoch = Some(lkg.info.leader_epoch);
incomplete_scope.info.lkg_scan_plan_digest = lkg.info.scan_plan_digest;
}
let _ = updates
.send(incomplete_scope)
.await;
let _ = updates.send(incomplete_scope).await;
return Ok(());
}
// Preserve the original set topology across capability filtering. During
@@ -214,9 +212,7 @@ impl ScannerIOCache for SetDisks {
incomplete_scope.info.lkg_leader_epoch = Some(lkg.info.leader_epoch);
incomplete_scope.info.lkg_scan_plan_digest = lkg.info.scan_plan_digest;
}
let _ = updates
.send(incomplete_scope)
.await;
let _ = updates.send(incomplete_scope).await;
return Ok(());
}
let set_disk_inventory = Arc::new(scanner_set_disk_inventory(self.as_ref()).await);
crates/scanner/src/scanner_io/io_cycle.rs
+13 -10
View File
@@ -386,16 +386,19 @@ impl ScannerIOCycle for ECStore {
budget_elapsed,
ctx.is_cancelled(),
);
let observational_usage = completed_usage.is_none().then(|| {
observational_data_usage_info(
&results,
&expected_sources,
&all_buckets,
scan_plan_digest,
want_cycle,
leader_epoch,
)
}).flatten();
let observational_usage = completed_usage
.is_none()
.then(|| {
observational_data_usage_info(
&results,
&expected_sources,
&all_buckets,
scan_plan_digest,
want_cycle,
leader_epoch,
)
})
.flatten();
let structurally_complete_snapshot = result.is_ok() && completed_all_sets && completed_usage.is_some();
let cycle_status = classify_nsscanner_cycle(
structurally_complete_snapshot,
crates/scanner/src/scanner_io/publish_gate_tests.rs
+5 -10
View File
@@ -129,16 +129,11 @@ fn partial_usage_is_observational_not_authoritative_for_quota() {
let stalled = lkg_root_cache("bucket", 1, stalled_source);
let expected = HashSet::from([current_source, stalled_source]);
assert!(completed_data_usage_info(&[current.clone(), stalled.clone()], &expected, &all_buckets, true, false, false).is_none());
let (observed, _) = observational_data_usage_info(
&[current, stalled],
&expected,
&all_buckets,
TEST_PLAN_DIGEST,
8,
3,
)
.expect("a completed set should produce an observational view");
assert!(
completed_data_usage_info(&[current.clone(), stalled.clone()], &expected, &all_buckets, true, false, false).is_none()
);
let (observed, _) = observational_data_usage_info(&[current, stalled], &expected, &all_buckets, TEST_PLAN_DIGEST, 8, 3)
.expect("a completed set should produce an observational view");
assert!(observed.usage_snapshot_partial);
assert!(!observed.usage_snapshot_complete);
assert_eq!(observed.usage_snapshot_converged, Some(false));