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

feat(scanner): expose usage freshness status (#3577)

Browse Source 
* feat(scanner): expose usage freshness status

* fix(scanner): reset dirty usage cycle state

---------

Co-authored-by: Henry Guo <marshawcoco@users.noreply.github.com>
This commit is contained in:
Henry Guo
2026-06-18 21:14:55 +08:00
committed by GitHub
parent 5d9fee5c0c
commit 80144ec886
6 changed files with 291 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/madmin/src/metrics.rs
+40
View File
@@ -280,6 +280,43 @@ impl ScannerMaintenanceControlSnapshot {
}
}
#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq)]
pub struct ScannerUsageFreshnessSnapshot {
#[serde(rename = "dirty_pending_buckets", default)]
pub dirty_pending_buckets: u64,
#[serde(rename = "last_dirty_mark_unix_secs", default)]
pub last_dirty_mark_unix_secs: u64,
#[serde(rename = "last_dirty_clear_unix_secs", default)]
pub last_dirty_clear_unix_secs: u64,
#[serde(rename = "last_cycle_dirty_buckets", default)]
pub last_cycle_dirty_buckets: u64,
#[serde(rename = "last_cycle_cleared_dirty_buckets", default)]
pub last_cycle_cleared_dirty_buckets: u64,
#[serde(rename = "last_usage_save_unix_secs", default)]
pub last_usage_save_unix_secs: u64,
#[serde(rename = "last_usage_save_result", default)]
pub last_usage_save_result: String,
#[serde(rename = "last_usage_save_result_code", default)]
pub last_usage_save_result_code: u64,
}
impl ScannerUsageFreshnessSnapshot {
fn merge(&mut self, other: &Self) {
self.dirty_pending_buckets = self.dirty_pending_buckets.saturating_add(other.dirty_pending_buckets);
self.last_dirty_mark_unix_secs = self.last_dirty_mark_unix_secs.max(other.last_dirty_mark_unix_secs);
self.last_dirty_clear_unix_secs = self.last_dirty_clear_unix_secs.max(other.last_dirty_clear_unix_secs);
self.last_cycle_dirty_buckets = self.last_cycle_dirty_buckets.saturating_add(other.last_cycle_dirty_buckets);
self.last_cycle_cleared_dirty_buckets = self
.last_cycle_cleared_dirty_buckets
.saturating_add(other.last_cycle_cleared_dirty_buckets);
if other.last_usage_save_unix_secs > self.last_usage_save_unix_secs {
self.last_usage_save_unix_secs = other.last_usage_save_unix_secs;
self.last_usage_save_result = other.last_usage_save_result.clone();
self.last_usage_save_result_code = other.last_usage_save_result_code;
}
}
}
impl ScannerSourceWorkSnapshot {
fn merge(&mut self, other: &Self) {
self.checked = self.checked.saturating_add(other.checked);
@@ -609,6 +646,8 @@ pub struct ScannerMetrics {
pub lifecycle_expiry: ScannerLifecycleExpirySnapshot,
#[serde(rename = "lifecycle_transition", default)]
pub lifecycle_transition: ScannerLifecycleTransitionSnapshot,
#[serde(rename = "usage_freshness", default)]
pub usage_freshness: ScannerUsageFreshnessSnapshot,
#[serde(rename = "maintenance_control", default)]
pub maintenance_control: ScannerMaintenanceControlSnapshot,
#[serde(rename = "throttle_idle_mode_enabled", default)]
@@ -690,6 +729,7 @@ impl ScannerMetrics {
self.pacing_pressure.merge(&other.pacing_pressure);
self.lifecycle_expiry.merge(&other.lifecycle_expiry);
self.lifecycle_transition.merge(&other.lifecycle_transition);
self.usage_freshness.merge(&other.usage_freshness);
self.maintenance_control.merge(&other.maintenance_control);
self.current_set_scan_concurrency_limit = self
.current_set_scan_concurrency_limit