decrease scanner frequency

Signed-off-by: junxiang Mu <1948535941@qq.com>

ecstore/src/heal/data_scanner.rs

@@ -171,22 +171,14 @@ pub async fn init_data_scanner() {
             // Use random factor (0.0 to 1.0) multiplied by the scanner cycle duration
             let random_factor: f64 = {
                 let mut rng = rand::thread_rng();
-                rng.gen_range(0.0..1.0)
+                rng.gen_range(1.0..10.0)
             };
             let base_cycle_duration = SCANNER_CYCLE.load(Ordering::SeqCst) as f64;
             let sleep_duration_secs = random_factor * base_cycle_duration;
 
-            // Ensure minimum sleep duration of 1 second to avoid high CPU usage
+            let sleep_duration = Duration::from_secs_f64(sleep_duration_secs);
-            let sleep_duration = if sleep_duration_secs < 1.0 {
-                Duration::from_secs(1)
-            } else {
-                Duration::from_secs_f64(sleep_duration_secs)
-            };
 
-            info!(
+            info!(duration_secs = sleep_duration.as_secs(), "Data scanner sleeping before next cycle");
-                duration_secs = sleep_duration.as_secs(),
-                "Data scanner sleeping before next cycle"
-            );
 
             // Sleep with the calculated duration
             sleep(sleep_duration).await;
@@ -245,12 +237,8 @@ async fn run_data_scanner() {
 
     // Read background healing information and determine scan mode
     let bg_heal_info = read_background_heal_info(store.clone()).await;
-    let scan_mode = get_cycle_scan_mode(
+    let scan_mode =
-        cycle_info.current,
+        get_cycle_scan_mode(cycle_info.current, bg_heal_info.bitrot_start_cycle, bg_heal_info.bitrot_start_time).await;
-        bg_heal_info.bitrot_start_cycle,
-        bg_heal_info.bitrot_start_time,
-    )
-    .await;
 
     // Update healing info if scan mode changed
     if bg_heal_info.current_scan_mode != scan_mode {
@@ -280,11 +268,7 @@ async fn run_data_scanner() {
     );
 
     // Run the namespace scanner
-    match store
+    match store.clone().ns_scanner(tx, cycle_info.current as usize, scan_mode).await {
-        .clone()
-        .ns_scanner(tx, cycle_info.current as usize, scan_mode)
-        .await
-    {
         Ok(_) => {
             info!(cycle = cycle_info.current, "Namespace scanner completed successfully");
 

ecstore/src/heal/data_scanner_metric.rs

@@ -4,12 +4,12 @@ use lazy_static::lazy_static;
 use madmin::metrics::ScannerMetrics as M_ScannerMetrics;
 use std::{
     collections::HashMap,
+    pin::Pin,
     sync::{
         atomic::{AtomicU64, Ordering},
         Arc,
     },
     time::{Duration, SystemTime},
-    pin::Pin,
 };
 use tokio::sync::{Mutex, RwLock};
 use tracing::debug;
@@ -206,9 +206,7 @@ pub struct ScannerMetrics {
 
 impl ScannerMetrics {
     pub fn new() -> Self {
-        let operations = (0..ScannerMetric::Last as usize)
+        let operations = (0..ScannerMetric::Last as usize).map(|_| AtomicU64::new(0)).collect();
-            .map(|_| AtomicU64::new(0))
-            .collect();
 
         let latency = (0..ScannerMetric::LastRealtime as usize)
             .map(|_| LockedLastMinuteLatency::new())
@@ -241,11 +239,7 @@ impl ScannerMetrics {
 
             // Log trace metrics
             if metric as u8 > ScannerMetric::StartTrace as u8 {
-                debug!(
+                debug!(metric = metric.as_str(), duration_ms = duration.as_millis(), "Scanner trace metric");
-                    metric = metric.as_str(),
-                    duration_ms = duration.as_millis(),
-                    "Scanner trace metric"
-                );
             }
         }
     }
@@ -408,10 +402,7 @@ pub type UpdateCurrentPathFn = Arc<dyn Fn(&str) -> Pin<Box<dyn std::future::Futu
 pub type CloseDiskFn = Arc<dyn Fn() -> Pin<Box<dyn std::future::Future<Output = ()> + Send>> + Send + Sync>;
 
 /// Create a current path updater for tracking scan progress
-pub fn current_path_updater(
+pub fn current_path_updater(disk: &str, initial: &str) -> (UpdateCurrentPathFn, CloseDiskFn) {
-    disk: &str, 
-    initial: &str
-) -> (UpdateCurrentPathFn, CloseDiskFn) {
     let tracker = Arc::new(CurrentPathTracker::new(initial.to_string()));
     let disk_name = disk.to_string();
 
@@ -442,11 +433,7 @@ pub fn current_path_updater(
         Arc::new(move || -> Pin<Box<dyn std::future::Future<Output = ()> + Send>> {
             let disk_name = disk_name.clone();
             Box::pin(async move {
-                globalScannerMetrics
+                globalScannerMetrics.current_paths.write().await.remove(&disk_name);
-                    .current_paths
-                    .write()
-                    .await
-                    .remove(&disk_name);
             })
         })
     };

ecstore/src/set_disk.rs

@@ -3002,7 +3002,7 @@ impl SetDisks {
             let self_clone = Arc::clone(&self);
             let bucket_rx_clone = bucket_rx.clone();
             let buckets_results_tx_clone = buckets_results_tx.clone();
-            futures.push(tokio::spawn(async move {
+            futures.push(async move {
                 loop {
                     match bucket_rx_clone.write().await.try_recv() {
                         Err(_) => return,
@@ -3083,12 +3083,11 @@ impl SetDisks {
                     }
                     info!("continue scanner");
                 }
-            }));
+            });
         }
 
         info!("ns_scanner start");
         let _ = join_all(futures).await;
-        drop(buckets_results_tx);
         let _ = task.await;
         info!("ns_scanner completed");
         Ok(())

ecstore/src/store.rs

@@ -827,7 +827,8 @@ impl ECStore {
                             }
                         }
                     });
-                    if let Err(err) = set.clone()
+                    if let Err(err) = set
+                        .clone()
                         .ns_scanner(&all_buckets_clone, want_cycle as u32, tx, heal_scan_mode)
                         .await
                     {