sync s3s rustfs branch, fix versiong config

ecstore/src/bucket/versioning/mod.rs

@@ -1,24 +1,25 @@
 use s3s::dto::{BucketVersioningStatus, VersioningConfiguration};
 
+use crate::utils::wildcard;
+
 pub trait VersioningApi {
     fn enabled(&self) -> bool;
     fn prefix_enabled(&self, prefix: &str) -> bool;
     fn prefix_suspended(&self, prefix: &str) -> bool;
+    fn versioned(&self, prefix: &str) -> bool;
+    fn suspended(&self) -> bool;
 }
 
 impl VersioningApi for VersioningConfiguration {
     fn enabled(&self) -> bool {
-        self.status
-            .as_ref()
-            .is_some_and(|v| v.as_str() == BucketVersioningStatus::ENABLED)
+        self.status == Some(BucketVersioningStatus::from_static(BucketVersioningStatus::ENABLED))
+    }
+    fn suspended(&self) -> bool {
+        self.status == Some(BucketVersioningStatus::from_static(BucketVersioningStatus::SUSPENDED))
     }
 
     fn prefix_enabled(&self, prefix: &str) -> bool {
-        if !self
-            .status
-            .as_ref()
-            .is_some_and(|v| v.as_str() == BucketVersioningStatus::ENABLED)
-        {
+        if self.status == Some(BucketVersioningStatus::from_static(BucketVersioningStatus::ENABLED)) {
             return false;
         }
 
@@ -26,27 +27,56 @@ impl VersioningApi for VersioningConfiguration {
             return true;
         }
 
-        // TODO: ExcludeFolders
+        if let Some(exclude_folders) = self.exclude_folders {
+            if exclude_folders && prefix.ends_with('/') {
+                return false;
+            }
+        }
+
+        if let Some(ref excluded_prefixes) = self.excluded_prefixes {
+            for p in excluded_prefixes.iter() {
+                if let Some(ref sprefix) = p.prefix {
+                    let pattern = format!("{}*", sprefix);
+                    if wildcard::match_simple(&pattern, prefix) {
+                        return false;
+                    }
+                }
+            }
+        }
 
         true
     }
     fn prefix_suspended(&self, prefix: &str) -> bool {
-        if self
-            .status
-            .as_ref()
-            .is_some_and(|v| v.as_str() == BucketVersioningStatus::SUSPENDED)
-        {
+        if self.status == Some(BucketVersioningStatus::from_static(BucketVersioningStatus::SUSPENDED)) {
             return true;
         }
 
-        if let Some(status) = self.status.as_ref() {
-            if status.as_str() == BucketVersioningStatus::ENABLED && prefix.is_empty() {
+        if self.status == Some(BucketVersioningStatus::from_static(BucketVersioningStatus::ENABLED)) {
+            if prefix.is_empty() {
                 return false;
+            }
 
-                // TODO: ExcludeFolders
+            if let Some(exclude_folders) = self.exclude_folders {
+                if exclude_folders && prefix.ends_with('/') {
+                    return true;
+                }
+            }
+
+            if let Some(ref excluded_prefixes) = self.excluded_prefixes {
+                for p in excluded_prefixes.iter() {
+                    if let Some(ref sprefix) = p.prefix {
+                        let pattern = format!("{}*", sprefix);
+                        if wildcard::match_simple(&pattern, prefix) {
+                            return true;
+                        }
+                    }
+                }
             }
         }
 
         false
     }
+    fn versioned(&self, prefix: &str) -> bool {
+        self.prefix_enabled(prefix) || self.prefix_suspended(prefix)
+    }
 }

ecstore/src/bucket/versioning_sys.rs

@@ -7,6 +7,9 @@ use tracing::warn;
 pub struct BucketVersioningSys {}
 
 impl BucketVersioningSys {
+    pub fn new() -> Self {
+        Self {}
+    }
     pub async fn enabled(bucket: &str) -> bool {
         match Self::get(bucket).await {
             Ok(res) => res.enabled(),
@@ -27,15 +30,15 @@ impl BucketVersioningSys {
         }
     }
 
-    // pub async fn suspended(bucket: &str) -> bool {
-    //     match Self::get(bucket).await {
-    //         Ok(res) => res.suspended(),
-    //         Err(err) => {
-    //             warn!("{:?}", err);
-    //             false
-    //         }
-    //     }
-    // }
+    pub async fn suspended(bucket: &str) -> bool {
+        match Self::get(bucket).await {
+            Ok(res) => res.suspended(),
+            Err(err) => {
+                warn!("{:?}", err);
+                false
+            }
+        }
+    }
 
     pub async fn prefix_suspended(bucket: &str, prefix: &str) -> bool {
         match Self::get(bucket).await {

ecstore/src/pools.rs

@@ -1,3 +1,4 @@
+use crate::bucket::versioning_sys::BucketVersioningSys;
 use crate::config::common::{read_config, save_config, CONFIG_PREFIX};
 use crate::config::error::ConfigError;
 use crate::disk::{BUCKET_META_PREFIX, RUSTFS_META_BUCKET};
@@ -477,7 +478,14 @@ impl ECStore {
         Ok(())
     }
 
-    async fn decommission_pool<S: StorageAPI>(&self, _idx: usize, _pool: Arc<S>, _bucket: DecomBucketInfo) -> Result<()> {
+    async fn decommission_pool<S: StorageAPI>(&self, _idx: usize, _pool: Arc<S>, bi: DecomBucketInfo) -> Result<()> {
+        let mut _vc = None;
+
+        if &bi.name == RUSTFS_META_BUCKET {
+            let versioning = BucketVersioningSys::get(&bi.name).await?;
+            _vc = Some(versioning);
+        }
+
         // FIXME:
         unimplemented!()
     }