merge heal

ecstore/src/store_api.rs

@@ -1,12 +1,8 @@
-use std::collections::HashMap;
-
+use crate::heal::heal_ops::HealSequence;
 use crate::{
     disk::DiskStore,
     error::{Error, Result},
-    heal::{
-        heal_commands::{HealOpts, HealResultItem},
-        heal_ops::HealObjectFn,
-    },
+    heal::heal_commands::{HealOpts, HealResultItem},
     utils::path::decode_dir_object,
     xhttp,
 };
@@ -15,13 +11,18 @@ use http::HeaderMap;
 use rmp_serde::Serializer;
 use s3s::dto::StreamingBlob;
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+use std::sync::Arc;
 use time::OffsetDateTime;
+use tokio::sync::RwLock;
 use uuid::Uuid;
 
 pub const ERASURE_ALGORITHM: &str = "rs-vandermonde";
 pub const BLOCK_SIZE_V2: usize = 1048576; // 1M
 pub const RESERVED_METADATA_PREFIX: &str = "X-Rustfs-Internal-";
 pub const RESERVED_METADATA_PREFIX_LOWER: &str = "X-Rustfs-Internal-";
+pub const RUSTFS_HEALING: &str = "X-Rustfs-Internal-healing";
+pub const RUSTFS_DATA_MOVE: &str = "X-Rustfs-Internal-data-mov";
 
 // #[derive(Debug, Clone)]
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
@@ -237,6 +238,16 @@ impl FileInfo {
         Err(Error::msg("part not found"))
     }
 
+    pub fn set_healing(&mut self) {
+        if self.metadata.is_none() {
+            self.metadata = Some(HashMap::new());
+        }
+
+        if let Some(metadata) = self.metadata.as_mut() {
+            metadata.insert(RUSTFS_HEALING.to_string(), "true".to_string());
+        }
+    }
+
     pub fn set_inline_data(&mut self) {
         if let Some(meta) = self.metadata.as_mut() {
             meta.insert("x-rustfs-inline-data".to_owned(), "true".to_owned());
@@ -978,10 +989,23 @@ pub trait StorageAPI: ObjectIO {
     async fn put_object_tags(&self, bucket: &str, object: &str, tags: &str, opts: &ObjectOptions) -> Result<ObjectInfo>;
     async fn delete_object_tags(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<ObjectInfo>;
 
-    async fn heal_format(&self, dry_run: bool) -> Result<HealResultItem>;
+    async fn heal_format(&self, dry_run: bool) -> Result<(HealResultItem, Option<Error>)>;
     async fn heal_bucket(&self, bucket: &str, opts: &HealOpts) -> Result<HealResultItem>;
-    async fn heal_object(&self, bucket: &str, object: &str, version_id: &str, opts: &HealOpts) -> Result<HealResultItem>;
-    async fn heal_objects(&self, bucket: &str, prefix: &str, opts: &HealOpts, func: HealObjectFn) -> Result<()>;
+    async fn heal_object(
+        &self,
+        bucket: &str,
+        object: &str,
+        version_id: &str,
+        opts: &HealOpts,
+    ) -> Result<(HealResultItem, Option<Error>)>;
+    async fn heal_objects(
+        &self,
+        bucket: &str,
+        prefix: &str,
+        opts: &HealOpts,
+        hs: Arc<RwLock<HealSequence>>,
+        is_meta: bool,
+    ) -> Result<()>;
     async fn get_pool_and_set(&self, id: &str) -> Result<(Option<usize>, Option<usize>, Option<usize>)>;
     async fn check_abandoned_parts(&self, bucket: &str, object: &str, opts: &HealOpts) -> Result<()>;
 }