auto heal(2)

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

ecstore/src/disk/endpoint.rs

@@ -2,6 +2,7 @@ use crate::error::{Error, Result};
 use crate::utils::net;
 use path_absolutize::Absolutize;
 use path_clean::PathClean;
+use std::fs;
 use std::{fmt::Display, path::Path};
 use url::{ParseError, Url};
 
@@ -29,7 +30,7 @@ pub struct Endpoint {
 impl Display for Endpoint {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         if self.url.scheme() == "file" {
-            write!(f, "{}", self.url.path())
+            write!(f, "{}", fs::canonicalize(self.url.path()).map_err(|_| std::fmt::Error)?.to_string_lossy().to_string())
         } else {
             write!(f, "{}", self.url)
         }

ecstore/src/disk/local.rs

@@ -6,7 +6,7 @@ use super::{endpoint::Endpoint, error::DiskError, format::FormatV3};
 use super::{
     os, CheckPartsResp, DeleteOptions, DiskAPI, DiskInfo, DiskInfoOptions, DiskLocation, DiskMetrics, FileInfoVersions,
     FileReader, FileWriter, Info, MetaCacheEntry, ReadMultipleReq, ReadMultipleResp, ReadOptions, RenameDataResp,
-    UpdateMetadataOpts, VolumeInfo, WalkDirOptions,
+    UpdateMetadataOpts, VolumeInfo, WalkDirOptions, BUCKET_META_PREFIX, RUSTFS_META_BUCKET,
 };
 use crate::bitrot::bitrot_verify;
 use crate::bucket::metadata_sys::GLOBAL_BucketMetadataSys;
@@ -23,7 +23,8 @@ use crate::heal::data_scanner::{has_active_rules, scan_data_folder, ScannerItem,
 use crate::heal::data_scanner_metric::{ScannerMetric, ScannerMetrics};
 use crate::heal::data_usage_cache::{DataUsageCache, DataUsageEntry};
 use crate::heal::error::{ERR_IGNORE_FILE_CONTRIB, ERR_SKIP_FILE};
-use crate::heal::heal_commands::HealScanMode;
+use crate::heal::heal_commands::{HealScanMode, HealingTracker};
+use crate::heal::heal_ops::HEALING_TRACKER_FILENAME;
 use crate::new_object_layer_fn;
 use crate::set_disk::{
     conv_part_err_to_int, CHECK_PART_FILE_CORRUPT, CHECK_PART_FILE_NOT_FOUND, CHECK_PART_SUCCESS, CHECK_PART_UNKNOWN,
@@ -32,7 +33,7 @@ use crate::set_disk::{
 use crate::store_api::{BitrotAlgorithm, StorageAPI};
 use crate::utils::fs::{access, lstat, O_APPEND, O_CREATE, O_RDONLY, O_WRONLY};
 use crate::utils::os::get_info;
-use crate::utils::path::{clean, has_suffix, GLOBAL_DIR_SUFFIX_WITH_SLASH, SLASH_SEPARATOR};
+use crate::utils::path::{clean, has_suffix, path_join, GLOBAL_DIR_SUFFIX_WITH_SLASH, SLASH_SEPARATOR};
 use crate::{
     file_meta::FileMeta,
     store_api::{FileInfo, RawFileInfo},
@@ -2013,6 +2014,26 @@ impl DiskAPI for LocalDisk {
         data_usage_info.info.last_update = Some(SystemTime::now());
         Ok(data_usage_info)
     }
+
+    async fn healing(&self) -> Option<HealingTracker> {
+        let healing_file = path_join(&[
+            self.path(),
+            PathBuf::from(RUSTFS_META_BUCKET),
+            PathBuf::from(BUCKET_META_PREFIX),
+            PathBuf::from(HEALING_TRACKER_FILENAME),
+        ]);
+        let b = match fs::read(healing_file).await {
+            Ok(b) => b,
+            Err(_) => return None,
+        };
+        if b.is_empty() {
+            return None;
+        }
+        match HealingTracker::unmarshal_msg(&b) {
+            Ok(h) => Some(h),
+            Err(_) => Some(HealingTracker::default())
+        }
+    }
 }
 
 async fn get_disk_info(drive_path: PathBuf) -> Result<(Info, bool)> {

ecstore/src/disk/mod.rs

@@ -19,7 +19,7 @@ use crate::{
     file_meta::{merge_file_meta_versions, FileMeta, FileMetaShallowVersion},
     heal::{
         data_usage_cache::{DataUsageCache, DataUsageEntry},
-        heal_commands::HealScanMode,
+        heal_commands::{HealScanMode, HealingTracker},
     },
     store_api::{FileInfo, RawFileInfo},
 };
@@ -349,11 +349,18 @@ impl DiskAPI for Disk {
         updates: Sender<DataUsageEntry>,
         scan_mode: HealScanMode,
     ) -> Result<DataUsageCache> {
-        match &*self {
+        match self {
             Disk::Local(local_disk) => local_disk.ns_scanner(cache, updates, scan_mode).await,
             Disk::Remote(remote_disk) => remote_disk.ns_scanner(cache, updates, scan_mode).await,
         }
     }
+
+    async fn healing(&self) -> Option<HealingTracker> {
+        match self {
+            Disk::Local(local_disk) => local_disk.healing().await,
+            Disk::Remote(remote_disk) => remote_disk.healing().await,
+        }
+    }
 }
 
 pub async fn new_disk(ep: &endpoint::Endpoint, opt: &DiskOption) -> Result<DiskStore> {
@@ -458,6 +465,7 @@ pub trait DiskAPI: Debug + Send + Sync + 'static {
         updates: Sender<DataUsageEntry>,
         scan_mode: HealScanMode,
     ) -> Result<DataUsageCache>;
+    async fn healing(&self) -> Option<HealingTracker>;
 }
 
 #[derive(Debug, Default, Serialize, Deserialize)]

ecstore/src/disk/remote.rs

@@ -26,7 +26,7 @@ use crate::{
     error::{Error, Result},
     heal::{
         data_usage_cache::{DataUsageCache, DataUsageEntry},
-        heal_commands::HealScanMode,
+        heal_commands::{HealScanMode, HealingTracker},
     },
     store_api::{FileInfo, RawFileInfo},
 };
@@ -775,4 +775,8 @@ impl DiskAPI for RemoteDisk {
             }
         }
     }
+
+    async fn healing(&self) -> Option<HealingTracker> {
+        None
+    }
 }