feat: Implement KMS configuration management and dynamic updates

- Added a new KMS configuration subsystem to support dynamic KMS settings.
- Introduced a global ConfigManager for managing KMS and general configurations.
- Implemented KMS configuration validation and connection testing.
- Created REST API endpoints for retrieving and updating KMS configurations.
- Enhanced the existing configuration handling to include KMS-specific parameters.
- Updated the Cargo.toml to include the new KMS feature.
- Added comprehensive tests for KMS configuration management and validation.

.cursorrules

@@ -3,7 +3,6 @@
 ## ⚠️ CRITICAL DEVELOPMENT RULES ⚠️
 
 ### 🚨 NEVER COMMIT DIRECTLY TO MASTER/MAIN BRANCH 🚨
-
 - **This is the most important rule - NEVER modify code directly on main or master branch**
 - **Always work on feature branches and use pull requests for all changes**
 - **Any direct commits to master/main branch are strictly forbidden**
@@ -16,50 +15,31 @@
   6. Create a pull request for review
 
 ## Project Overview
-
 RustFS is a high-performance distributed object storage system written in Rust, compatible with S3 API. The project adopts a modular architecture, supporting erasure coding storage, multi-tenant management, observability, and other enterprise-level features.
 
 ## Core Architecture Principles
 
 ### 1. Modular Design
-
 - Project uses Cargo workspace structure, containing multiple independent crates
 - Core modules: `rustfs` (main service), `ecstore` (erasure coding storage), `common` (shared components)
 - Functional modules: `iam` (identity management), `madmin` (management interface), `crypto` (encryption), etc.
 - Tool modules: `cli` (command line tool), `crates/*` (utility libraries)
 
 ### 2. Asynchronous Programming Pattern
-
 - Comprehensive use of `tokio` async runtime
 - Prioritize `async/await` syntax
 - Use `async-trait` for async methods in traits
 - Avoid blocking operations, use `spawn_blocking` when necessary
 
 ### 3. Error Handling Strategy
-
+- Use unified error type `common::error::Error`
-- **Use modular, type-safe error handling with `thiserror`**
+- Support error chains and context information
-- Each module should define its own error type using `thiserror::Error` derive macro
+- Use `thiserror` to define specific error types
-- Support error chains and context information through `#[from]` and `#[source]` attributes
+- Error conversion uses `downcast_ref` for type checking
-- Use `Result<T>` type aliases for consistency within each module
-- Error conversion between modules should use explicit `From` implementations
-- Follow the pattern: `pub type Result<T> = core::result::Result<T, Error>`
-- Use `#[error("description")]` attributes for clear error messages
-- Support error downcasting when needed through `other()` helper methods
-- Implement `Clone` for errors when required by the domain logic
-- **Current module error types:**
-  - `ecstore::error::StorageError` - Storage layer errors
-  - `ecstore::disk::error::DiskError` - Disk operation errors
-  - `iam::error::Error` - Identity and access management errors
-  - `policy::error::Error` - Policy-related errors
-  - `crypto::error::Error` - Cryptographic operation errors
-  - `filemeta::error::Error` - File metadata errors
-  - `rustfs::error::ApiError` - API layer errors
-  - Module-specific error types for specialized functionality
 
 ## Code Style Guidelines
 
 ### 1. Formatting Configuration
-
 ```toml
 max_width = 130
 fn_call_width = 90
@@ -75,25 +55,21 @@ single_line_let_else_max_width = 100
 Before every commit, you **MUST**:
 
 1. **Format your code**:
-
    ```bash
    cargo fmt --all
    ```
 
 2. **Verify formatting**:
-
    ```bash
    cargo fmt --all --check
    ```
 
 3. **Pass clippy checks**:
-
    ```bash
    cargo clippy --all-targets --all-features -- -D warnings
    ```
 
 4. **Ensure compilation**:
-
    ```bash
    cargo check --all-targets
    ```
@@ -168,7 +144,6 @@ Example output when formatting fails:
 ```
 
 ### 3. Naming Conventions
-
 - Use `snake_case` for functions, variables, modules
 - Use `PascalCase` for types, traits, enums
 - Constants use `SCREAMING_SNAKE_CASE`
@@ -178,7 +153,6 @@ Example output when formatting fails:
 - Choose names that clearly express the purpose and intent
 
 ### 4. Type Declaration Guidelines
-
 - **Prefer type inference over explicit type declarations** when the type is obvious from context
 - Let the Rust compiler infer types whenever possible to reduce verbosity and improve maintainability
 - Only specify types explicitly when:
@@ -188,7 +162,6 @@ Example output when formatting fails:
   - Needed to resolve ambiguity between multiple possible types
 
 **Good examples (prefer these):**
-
 ```rust
 // Compiler can infer the type
 let items = vec![1, 2, 3, 4];
@@ -200,7 +173,6 @@ let filtered: Vec<_> = items.iter().filter(|&&x| x > 2).collect();
 ```
 
 **Avoid unnecessary explicit types:**
-
 ```rust
 // Unnecessary - type is obvious
 let items: Vec<i32> = vec![1, 2, 3, 4];
@@ -209,7 +181,6 @@ let result: ProcessResult = process_data(&input);
 ```
 
 **When explicit types are beneficial:**
-
 ```rust
 // API boundaries - always specify types
 pub fn process_data(input: &[u8]) -> Result<ProcessResult, Error> { ... }
@@ -222,7 +193,6 @@ let cache: HashMap<String, Arc<Mutex<CacheEntry>>> = HashMap::new();
 ```
 
 ### 5. Documentation Comments
-
 - Public APIs must have documentation comments
 - Use `///` for documentation comments
 - Complex functions add `# Examples` and `# Parameters` descriptions
@@ -231,7 +201,6 @@ let cache: HashMap<String, Arc<Mutex<CacheEntry>>> = HashMap::new();
 - Avoid meaningless comments like "debug 111" or placeholder text
 
 ### 6. Import Guidelines
-
 - Standard library imports first
 - Third-party crate imports in the middle
 - Project internal imports last
@@ -240,7 +209,6 @@ let cache: HashMap<String, Arc<Mutex<CacheEntry>>> = HashMap::new();
 ## Asynchronous Programming Guidelines
 
 ### 1. Trait Definition
-
 ```rust
 #[async_trait::async_trait]
 pub trait StorageAPI: Send + Sync {
@@ -249,7 +217,6 @@ pub trait StorageAPI: Send + Sync {
 ```
 
 ### 2. Error Handling
-
 ```rust
 // Use ? operator to propagate errors
 async fn example_function() -> Result<()> {
@@ -260,7 +227,6 @@ async fn example_function() -> Result<()> {
 ```
 
 ### 3. Concurrency Control
-
 - Use `Arc` and `Mutex`/`RwLock` for shared state management
 - Prioritize async locks from `tokio::sync`
 - Avoid holding locks for long periods
@@ -268,7 +234,6 @@ async fn example_function() -> Result<()> {
 ## Logging and Tracing Guidelines
 
 ### 1. Tracing Usage
-
 ```rust
 #[tracing::instrument(skip(self, data))]
 async fn process_data(&self, data: &[u8]) -> Result<()> {
@@ -278,7 +243,6 @@ async fn process_data(&self, data: &[u8]) -> Result<()> {
 ```
 
 ### 2. Log Levels
-
 - `error!`: System errors requiring immediate attention
 - `warn!`: Warning information that may affect functionality
 - `info!`: Important business information
@@ -286,7 +250,6 @@ async fn process_data(&self, data: &[u8]) -> Result<()> {
 - `trace!`: Detailed execution paths
 
 ### 3. Structured Logging
-
 ```rust
 info!(
     counter.rustfs_api_requests_total = 1_u64,
@@ -299,213 +262,45 @@ info!(
 ## Error Handling Guidelines
 
 ### 1. Error Type Definition
-
 ```rust
-// Use thiserror for module-specific error types
+#[derive(Debug, thiserror::Error)]
-#[derive(thiserror::Error, Debug)]
 pub enum MyError {
     #[error("IO error: {0}")]
     Io(#[from] std::io::Error),
-
-    #[error("Storage error: {0}")]
-    Storage(#[from] ecstore::error::StorageError),
-
     #[error("Custom error: {message}")]
     Custom { message: String },
-
-    #[error("File not found: {path}")]
-    FileNotFound { path: String },
-
-    #[error("Invalid configuration: {0}")]
-    InvalidConfig(String),
-}
-
-// Provide Result type alias for the module
-pub type Result<T> = core::result::Result<T, MyError>;
-```
-
-### 2. Error Helper Methods
-
-```rust
-impl MyError {
-    /// Create error from any compatible error type
-    pub fn other<E>(error: E) -> Self
-    where
-        E: Into<Box<dyn std::error::Error + Send + Sync>>,
-    {
-        MyError::Io(std::io::Error::other(error))
-    }
 }
 ```
 
-### 3. Error Conversion Between Modules
+### 2. Error Conversion
-
 ```rust
-// Convert between different module error types
+pub fn to_s3_error(err: Error) -> S3Error {
-impl From<ecstore::error::StorageError> for MyError {
+    if let Some(storage_err) = err.downcast_ref::<StorageError>() {
-    fn from(e: ecstore::error::StorageError) -> Self {
+        match storage_err {
-        match e {
+            StorageError::ObjectNotFound(bucket, object) => {
-            ecstore::error::StorageError::FileNotFound => {
+                s3_error!(NoSuchKey, "{}/{}", bucket, object)
-                MyError::FileNotFound { path: "unknown".to_string() }
             }
-            _ => MyError::Storage(e),
+            // Other error types...
-        }
-    }
-}
-
-// Provide reverse conversion when needed
-impl From<MyError> for ecstore::error::StorageError {
-    fn from(e: MyError) -> Self {
-        match e {
-            MyError::FileNotFound { .. } => ecstore::error::StorageError::FileNotFound,
-            MyError::Storage(e) => e,
-            _ => ecstore::error::StorageError::other(e),
         }
     }
+    // Default error handling
 }
 ```
 
-### 4. Error Context and Propagation
+### 3. Error Context
-
 ```rust
-// Use ? operator for clean error propagation
+// Add error context
-async fn example_function() -> Result<()> {
+.map_err(|e| Error::from_string(format!("Failed to process {}: {}", path, e)))?
-    let data = read_file("path").await?;
-    process_data(data).await?;
-    Ok(())
-}
-
-// Add context to errors
-fn process_with_context(path: &str) -> Result<()> {
-    std::fs::read(path)
-        .map_err(|e| MyError::Custom {
-            message: format!("Failed to read {}: {}", path, e)
-        })?;
-    Ok(())
-}
-```
-
-### 5. API Error Conversion (S3 Example)
-
-```rust
-// Convert storage errors to API-specific errors
-use s3s::{S3Error, S3ErrorCode};
-
-#[derive(Debug)]
-pub struct ApiError {
-    pub code: S3ErrorCode,
-    pub message: String,
-    pub source: Option<Box<dyn std::error::Error + Send + Sync>>,
-}
-
-impl From<ecstore::error::StorageError> for ApiError {
-    fn from(err: ecstore::error::StorageError) -> Self {
-        let code = match &err {
-            ecstore::error::StorageError::BucketNotFound(_) => S3ErrorCode::NoSuchBucket,
-            ecstore::error::StorageError::ObjectNotFound(_, _) => S3ErrorCode::NoSuchKey,
-            ecstore::error::StorageError::BucketExists(_) => S3ErrorCode::BucketAlreadyExists,
-            ecstore::error::StorageError::InvalidArgument(_, _, _) => S3ErrorCode::InvalidArgument,
-            ecstore::error::StorageError::MethodNotAllowed => S3ErrorCode::MethodNotAllowed,
-            ecstore::error::StorageError::StorageFull => S3ErrorCode::ServiceUnavailable,
-            _ => S3ErrorCode::InternalError,
-        };
-
-        ApiError {
-            code,
-            message: err.to_string(),
-            source: Some(Box::new(err)),
-        }
-    }
-}
-
-impl From<ApiError> for S3Error {
-    fn from(err: ApiError) -> Self {
-        let mut s3e = S3Error::with_message(err.code, err.message);
-        if let Some(source) = err.source {
-            s3e.set_source(source);
-        }
-        s3e
-    }
-}
-```
-
-### 6. Error Handling Best Practices
-
-#### Pattern Matching and Error Classification
-
-```rust
-// Use pattern matching for specific error handling
-async fn handle_storage_operation() -> Result<()> {
-    match storage.get_object("bucket", "key").await {
-        Ok(object) => process_object(object),
-        Err(ecstore::error::StorageError::ObjectNotFound(bucket, key)) => {
-            warn!("Object not found: {}/{}", bucket, key);
-            create_default_object(bucket, key).await
-        }
-        Err(ecstore::error::StorageError::BucketNotFound(bucket)) => {
-            error!("Bucket not found: {}", bucket);
-            Err(MyError::Custom {
-                message: format!("Bucket {} does not exist", bucket)
-            })
-        }
-        Err(e) => {
-            error!("Storage operation failed: {}", e);
-            Err(MyError::Storage(e))
-        }
-    }
-}
-```
-
-#### Error Aggregation and Reporting
-
-```rust
-// Collect and report multiple errors
-pub fn validate_configuration(config: &Config) -> Result<()> {
-    let mut errors = Vec::new();
-
-    if config.bucket_name.is_empty() {
-        errors.push("Bucket name cannot be empty");
-    }
-
-    if config.region.is_empty() {
-        errors.push("Region must be specified");
-    }
-
-    if !errors.is_empty() {
-        return Err(MyError::Custom {
-            message: format!("Configuration validation failed: {}", errors.join(", "))
-        });
-    }
-
-    Ok(())
-}
-```
-
-#### Contextual Error Information
-
-```rust
-// Add operation context to errors
-#[tracing::instrument(skip(self))]
-async fn upload_file(&self, bucket: &str, key: &str, data: Vec<u8>) -> Result<()> {
-    self.storage
-        .put_object(bucket, key, data)
-        .await
-        .map_err(|e| MyError::Custom {
-            message: format!("Failed to upload {}/{}: {}", bucket, key, e)
-        })
-}
 ```
 
 ## Performance Optimization Guidelines
 
 ### 1. Memory Management
-
 - Use `Bytes` instead of `Vec<u8>` for zero-copy operations
 - Avoid unnecessary cloning, use reference passing
 - Use `Arc` for sharing large objects
 
 ### 2. Concurrency Optimization
-
 ```rust
 // Use join_all for concurrent operations
 let futures = disks.iter().map(|disk| disk.operation());
@@ -513,14 +308,12 @@ let results = join_all(futures).await;
 ```
 
 ### 3. Caching Strategy
-
 - Use `lazy_static` or `OnceCell` for global caching
 - Implement LRU cache to avoid memory leaks
 
 ## Testing Guidelines
 
 ### 1. Unit Tests
-
 ```rust
 #[cfg(test)]
 mod tests {
@@ -538,55 +331,14 @@ mod tests {
     fn test_with_cases(input: &str, expected: &str) {
         assert_eq!(function(input), expected);
     }
-
-    #[test]
-    fn test_error_conversion() {
-        use ecstore::error::StorageError;
-
-        let storage_err = StorageError::BucketNotFound("test-bucket".to_string());
-        let api_err: ApiError = storage_err.into();
-
-        assert_eq!(api_err.code, S3ErrorCode::NoSuchBucket);
-        assert!(api_err.message.contains("test-bucket"));
-        assert!(api_err.source.is_some());
-    }
-
-    #[test]
-    fn test_error_types() {
-        let io_err = std::io::Error::new(std::io::ErrorKind::NotFound, "file not found");
-        let my_err = MyError::Io(io_err);
-
-        // Test error matching
-        match my_err {
-            MyError::Io(_) => {}, // Expected
-            _ => panic!("Unexpected error type"),
-        }
-    }
-
-    #[test]
-    fn test_error_context() {
-        let result = process_with_context("nonexistent_file.txt");
-        assert!(result.is_err());
-
-        let err = result.unwrap_err();
-        match err {
-            MyError::Custom { message } => {
-                assert!(message.contains("Failed to read"));
-                assert!(message.contains("nonexistent_file.txt"));
-            }
-            _ => panic!("Expected Custom error"),
-        }
-    }
 }
 ```
 
 ### 2. Integration Tests
-
 - Use `e2e_test` module for end-to-end testing
 - Simulate real storage environments
 
 ### 3. Test Quality Standards
-
 - Write meaningful test cases that verify actual functionality
 - Avoid placeholder or debug content like "debug 111", "test test", etc.
 - Use descriptive test names that clearly indicate what is being tested
@@ -596,11 +348,9 @@ mod tests {
 ## Cross-Platform Compatibility Guidelines
 
 ### 1. CPU Architecture Compatibility
-
 - **Always consider multi-platform and different CPU architecture compatibility** when writing code
 - Support major architectures: x86_64, aarch64 (ARM64), and other target platforms
 - Use conditional compilation for architecture-specific code:
-
 ```rust
 #[cfg(target_arch = "x86_64")]
 fn optimized_x86_64_function() { /* x86_64 specific implementation */ }
@@ -613,19 +363,16 @@ fn generic_function() { /* Generic fallback implementation */ }
 ```
 
 ### 2. Platform-Specific Dependencies
-
 - Use feature flags for platform-specific dependencies
 - Provide fallback implementations for unsupported platforms
 - Test on multiple architectures in CI/CD pipeline
 
 ### 3. Endianness Considerations
-
 - Use explicit byte order conversion when dealing with binary data
 - Prefer `to_le_bytes()`, `from_le_bytes()` for consistent little-endian format
 - Use `byteorder` crate for complex binary format handling
 
 ### 4. SIMD and Performance Optimizations
-
 - Use portable SIMD libraries like `wide` or `packed_simd`
 - Provide fallback implementations for non-SIMD architectures
 - Use runtime feature detection when appropriate
@@ -633,12 +380,10 @@ fn generic_function() { /* Generic fallback implementation */ }
 ## Security Guidelines
 
 ### 1. Memory Safety
-
 - Disable `unsafe` code (workspace.lints.rust.unsafe_code = "deny")
 - Use `rustls` instead of `openssl`
 
 ### 2. Authentication and Authorization
-
 ```rust
 // Use IAM system for permission checks
 let identity = iam.authenticate(&access_key, &secret_key).await?;
@@ -648,13 +393,11 @@ iam.authorize(&identity, &action, &resource).await?;
 ## Configuration Management Guidelines
 
 ### 1. Environment Variables
-
 - Use `RUSTFS_` prefix
 - Support both configuration files and environment variables
 - Provide reasonable default values
 
 ### 2. Configuration Structure
-
 ```rust
 #[derive(Debug, Deserialize, Clone)]
 pub struct Config {
@@ -668,12 +411,10 @@ pub struct Config {
 ## Dependency Management Guidelines
 
 ### 1. Workspace Dependencies
-
 - Manage versions uniformly at workspace level
 - Use `workspace = true` to inherit configuration
 
 ### 2. Feature Flags
-
 ```rust
 [features]
 default = ["file"]
@@ -684,18 +425,15 @@ kafka = ["dep:rdkafka"]
 ## Deployment and Operations Guidelines
 
 ### 1. Containerization
-
 - Provide Dockerfile and docker-compose configuration
 - Support multi-stage builds to optimize image size
 
 ### 2. Observability
-
 - Integrate OpenTelemetry for distributed tracing
 - Support Prometheus metrics collection
 - Provide Grafana dashboards
 
 ### 3. Health Checks
-
 ```rust
 // Implement health check endpoint
 async fn health_check() -> Result<HealthStatus> {
@@ -706,7 +444,6 @@ async fn health_check() -> Result<HealthStatus> {
 ## Code Review Checklist
 
 ### 1. **Code Formatting and Quality (MANDATORY)**
-
 - [ ] **Code is properly formatted** (`cargo fmt --all --check` passes)
 - [ ] **All clippy warnings are resolved** (`cargo clippy --all-targets --all-features -- -D warnings` passes)
 - [ ] **Code compiles successfully** (`cargo check --all-targets` passes)
@@ -714,32 +451,27 @@ async fn health_check() -> Result<HealthStatus> {
 - [ ] **No formatting-related changes** mixed with functional changes (separate commits)
 
 ### 2. Functionality
-
 - [ ] Are all error cases properly handled?
 - [ ] Is there appropriate logging?
 - [ ] Is there necessary test coverage?
 
 ### 3. Performance
-
 - [ ] Are unnecessary memory allocations avoided?
 - [ ] Are async operations used correctly?
 - [ ] Are there potential deadlock risks?
 
 ### 4. Security
-
 - [ ] Are input parameters properly validated?
 - [ ] Are there appropriate permission checks?
 - [ ] Is information leakage avoided?
 
 ### 5. Cross-Platform Compatibility
-
 - [ ] Does the code work on different CPU architectures (x86_64, aarch64)?
 - [ ] Are platform-specific features properly gated with conditional compilation?
 - [ ] Is byte order handling correct for binary data?
 - [ ] Are there appropriate fallback implementations for unsupported platforms?
 
 ### 6. Code Commits and Documentation
-
 - [ ] Does it comply with [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)?
 - [ ] Are commit messages concise and under 72 characters for the title line?
 - [ ] Commit titles should be concise and in English, avoid Chinese
@@ -748,7 +480,6 @@ async fn health_check() -> Result<HealthStatus> {
 ## Common Patterns and Best Practices
 
 ### 1. Resource Management
-
 ```rust
 // Use RAII pattern for resource management
 pub struct ResourceGuard {
@@ -763,7 +494,6 @@ impl Drop for ResourceGuard {
 ```
 
 ### 2. Dependency Injection
-
 ```rust
 // Use dependency injection pattern
 pub struct Service {
@@ -773,7 +503,6 @@ pub struct Service {
 ```
 
 ### 3. Graceful Shutdown
-
 ```rust
 // Implement graceful shutdown
 async fn shutdown_gracefully(shutdown_rx: &mut Receiver<()>) {
@@ -792,19 +521,16 @@ async fn shutdown_gracefully(shutdown_rx: &mut Receiver<()>) {
 ## Domain-Specific Guidelines
 
 ### 1. Storage Operations
-
 - All storage operations must support erasure coding
 - Implement read/write quorum mechanisms
 - Support data integrity verification
 
 ### 2. Network Communication
-
 - Use gRPC for internal service communication
 - HTTP/HTTPS support for S3-compatible API
 - Implement connection pooling and retry mechanisms
 
 ### 3. Metadata Management
-
 - Use FlatBuffers for serialization
 - Support version control and migration
 - Implement metadata caching
@@ -814,12 +540,11 @@ These rules should serve as guiding principles when developing the RustFS projec
 ### 4. Code Operations
 
 #### Branch Management
-
+ - **🚨 CRITICAL: NEVER modify code directly on main or master branch - THIS IS ABSOLUTELY FORBIDDEN 🚨**
-- **🚨 CRITICAL: NEVER modify code directly on main or master branch - THIS IS ABSOLUTELY FORBIDDEN 🚨**
+ - **⚠️ ANY DIRECT COMMITS TO MASTER/MAIN WILL BE REJECTED AND MUST BE REVERTED IMMEDIATELY ⚠️**
-- **⚠️ ANY DIRECT COMMITS TO MASTER/MAIN WILL BE REJECTED AND MUST BE REVERTED IMMEDIATELY ⚠️**
+ - **Always work on feature branches - NO EXCEPTIONS**
-- **Always work on feature branches - NO EXCEPTIONS**
+ - Always check the .cursorrules file before starting to ensure you understand the project guidelines
-- Always check the .cursorrules file before starting to ensure you understand the project guidelines
+ - **MANDATORY workflow for ALL changes:**
-- **MANDATORY workflow for ALL changes:**
    1. `git checkout main` (switch to main branch)
    2. `git pull` (get latest changes)
    3. `git checkout -b feat/your-feature-name` (create and switch to feature branch)
@@ -827,54 +552,28 @@ These rules should serve as guiding principles when developing the RustFS projec
    5. Test thoroughly before committing
    6. Commit and push to the feature branch
    7. Create a pull request for code review
-- Use descriptive branch names following the pattern: `feat/feature-name`, `fix/issue-name`, `refactor/component-name`, etc.
+ - Use descriptive branch names following the pattern: `feat/feature-name`, `fix/issue-name`, `refactor/component-name`, etc.
-- **Double-check current branch before ANY commit: `git branch` to ensure you're NOT on main/master**
+ - **Double-check current branch before ANY commit: `git branch` to ensure you're NOT on main/master**
-- Ensure all changes are made on feature branches and merged through pull requests
+ - Ensure all changes are made on feature branches and merged through pull requests
 
 #### Development Workflow
-
+ - Use English for all code comments, documentation, and variable names
-- Use English for all code comments, documentation, and variable names
+ - Write meaningful and descriptive names for variables, functions, and methods
-- Write meaningful and descriptive names for variables, functions, and methods
+ - Avoid meaningless test content like "debug 111" or placeholder values
-- Avoid meaningless test content like "debug 111" or placeholder values
+ - Before each change, carefully read the existing code to ensure you understand the code structure and implementation, do not break existing logic implementation, do not introduce new issues
-- Before each change, carefully read the existing code to ensure you understand the code structure and implementation, do not break existing logic implementation, do not introduce new issues
+ - Ensure each change provides sufficient test cases to guarantee code correctness
-- Ensure each change provides sufficient test cases to guarantee code correctness
+ - Do not arbitrarily modify numbers and constants in test cases, carefully analyze their meaning to ensure test case correctness
-- Do not arbitrarily modify numbers and constants in test cases, carefully analyze their meaning to ensure test case correctness
+ - When writing or modifying tests, check existing test cases to ensure they have scientific naming and rigorous logic testing, if not compliant, modify test cases to ensure scientific and rigorous testing
-- When writing or modifying tests, check existing test cases to ensure they have scientific naming and rigorous logic testing, if not compliant, modify test cases to ensure scientific and rigorous testing
+ - **Before committing any changes, run `cargo clippy --all-targets --all-features -- -D warnings` to ensure all code passes Clippy checks**
-- **Before committing any changes, run `cargo clippy --all-targets --all-features -- -D warnings` to ensure all code passes Clippy checks**
+ - After each development completion, first git add . then git commit -m "feat: feature description" or "fix: issue description", ensure compliance with [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
-- After each development completion, first git add . then git commit -m "feat: feature description" or "fix: issue description", ensure compliance with [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
+ - **Keep commit messages concise and under 72 characters** for the title line, use body for detailed explanations if needed
-- **Keep commit messages concise and under 72 characters** for the title line, use body for detailed explanations if needed
+ - After each development completion, first git push to remote repository
-- After each development completion, first git push to remote repository
+ - After each change completion, summarize the changes, do not create summary files, provide a brief change description, ensure compliance with [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
-- After each change completion, summarize the changes, do not create summary files, provide a brief change description, ensure compliance with [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
+ - Provide change descriptions needed for PR in the conversation, ensure compliance with [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
-- Provide change descriptions needed for PR in the conversation, ensure compliance with [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
+ - **Always provide PR descriptions in English** after completing any changes, including:
-- **Always provide PR descriptions in English** after completing any changes, including:
+   - Clear and concise title following Conventional Commits format
-  - Clear and concise title following Conventional Commits format
+   - Detailed description of what was changed and why
-  - Detailed description of what was changed and why
+   - List of key changes and improvements
-  - List of key changes and improvements
+   - Any breaking changes or migration notes if applicable
-  - Any breaking changes or migration notes if applicable
+   - Testing information and verification steps
-  - Testing information and verification steps
+ - **Provide PR descriptions in copyable markdown format** enclosed in code blocks for easy one-click copying
-- **Provide PR descriptions in copyable markdown format** enclosed in code blocks for easy one-click copying
-
-## 🚫 AI 文档生成限制
-
-### 禁止生成总结文档
-
-- **严格禁止创建任何形式的AI生成总结文档**
-- **不得创建包含大量表情符号、详细格式化表格和典型AI风格的文档**
-- **不得在项目中生成以下类型的文档：**
-  - 基准测试总结文档（BENCHMARK*.md）
-  - 实现对比分析文档（IMPLEMENTATION_COMPARISON*.md）
-  - 性能分析报告文档
-  - 架构总结文档
-  - 功能对比文档
-  - 任何带有大量表情符号和格式化内容的文档
-- **如果需要文档，请只在用户明确要求时创建，并保持简洁实用的风格**
-- **文档应当专注于实际需要的信息，避免过度格式化和装饰性内容**
-- **任何发现的AI生成总结文档都应该立即删除**
-
-### 允许的文档类型
-
-- README.md（项目介绍，保持简洁）
-- 技术文档（仅在明确需要时创建）
-- 用户手册（仅在明确需要时创建）
-- API文档（从代码生成）
-- 变更日志（CHANGELOG.md）

.docker/Dockerfile.devenv

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM m.daocloud.io/docker.io/library/ubuntu:22.04
 
 ENV LANG C.UTF-8
 
@@ -7,10 +7,9 @@ RUN sed -i s@http://.*archive.ubuntu.com@http://repo.huaweicloud.com@g /etc/apt/
 RUN apt-get clean && apt-get update && apt-get install wget git curl unzip gcc pkg-config libssl-dev lld libdbus-1-dev libwayland-dev libwebkit2gtk-4.1-dev libxdo-dev -y
 
 # install protoc
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v31.1/protoc-31.1-linux-x86_64.zip \
+RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip \
-    && unzip protoc-31.1-linux-x86_64.zip -d protoc3 \
+    && unzip protoc-30.2-linux-x86_64.zip -d protoc3 \
-    && mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc \
+    && mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc && mv protoc3/include/* /usr/local/include/ && rm -rf protoc-30.2-linux-x86_64.zip protoc3
-    && mv protoc3/include/* /usr/local/include/ && rm -rf protoc-31.1-linux-x86_64.zip protoc3
 
 # install flatc
 RUN wget https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.flatc.binary.g++-13.zip \
@@ -18,7 +17,10 @@ RUN wget https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.
     && mv flatc /usr/local/bin/ && chmod +x /usr/local/bin/flatc && rm -rf Linux.flatc.binary.g++-13.zip
 
 # install rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV RUSTUP_DIST_SERVER="https://rsproxy.cn"
+ENV RUSTUP_UPDATE_ROOT="https://rsproxy.cn/rustup"
+RUN curl -o rustup-init.sh --proto '=https' --tlsv1.2 -sSf https://rsproxy.cn/rustup-init.sh \
+    && sh rustup-init.sh -y && rm -rf rustup-init.sh
 
 COPY .docker/cargo.config.toml /root/.cargo/config.toml
 

.docker/Dockerfile.rockylinux9.3

@@ -1,4 +1,4 @@
-FROM rockylinux:9.3 AS builder
+FROM m.daocloud.io/docker.io/library/rockylinux:9.3 AS builder
 
 ENV LANG C.UTF-8
 
@@ -13,10 +13,10 @@ RUN dnf makecache
 RUN yum install wget git unzip gcc openssl-devel pkgconf-pkg-config -y
 
 # install protoc
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v31.1/protoc-31.1-linux-x86_64.zip \
+RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip \
-    && unzip protoc-31.1-linux-x86_64.zip -d protoc3 \
+    && unzip protoc-30.2-linux-x86_64.zip -d protoc3 \
     && mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc \
-    && mv protoc3/include/* /usr/local/include/ && rm -rf protoc-31.1-linux-x86_64.zip protoc3
+    && rm -rf protoc-30.2-linux-x86_64.zip protoc3
 
 # install flatc
 RUN wget https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.flatc.binary.g++-13.zip \
@@ -25,7 +25,10 @@ RUN wget https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.
     && rm -rf Linux.flatc.binary.g++-13.zip
 
 # install rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV RUSTUP_DIST_SERVER="https://rsproxy.cn"
+ENV RUSTUP_UPDATE_ROOT="https://rsproxy.cn/rustup"
+RUN curl -o rustup-init.sh --proto '=https' --tlsv1.2 -sSf https://rsproxy.cn/rustup-init.sh \
+    && sh rustup-init.sh -y && rm -rf rustup-init.sh
 
 COPY .docker/cargo.config.toml /root/.cargo/config.toml
 

.docker/Dockerfile.rustyvault

@@ -0,0 +1,22 @@
+FROM vault:1.13
+
+# Configure Vault for dev mode
+ENV VAULT_DEV_ROOT_TOKEN_ID=rustfs-root-token
+ENV VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200
+
+# Install curl for health checks
+USER root
+RUN apk add --no-cache curl jq
+
+# Copy the Vault initialization script
+COPY vault-init.sh /usr/local/bin/vault-init.sh
+RUN chmod +x /usr/local/bin/vault-init.sh
+
+# Switch back to vault user
+USER vault
+
+# Expose Vault port
+EXPOSE 8200
+
+# Start Vault in dev mode and run the initialization script
+ENTRYPOINT ["sh", "-c", "vault server -dev & sleep 5 && vault-init.sh"]

.docker/Dockerfile.ubuntu22.04

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM m.daocloud.io/docker.io/library/ubuntu:22.04
 
 ENV LANG C.UTF-8
 
@@ -7,10 +7,9 @@ RUN sed -i s@http://.*archive.ubuntu.com@http://repo.huaweicloud.com@g /etc/apt/
 RUN apt-get clean && apt-get update && apt-get install wget git curl unzip gcc pkg-config libssl-dev lld libdbus-1-dev libwayland-dev libwebkit2gtk-4.1-dev libxdo-dev -y
 
 # install protoc
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v31.1/protoc-31.1-linux-x86_64.zip \
+RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip \
-    && unzip protoc-31.1-linux-x86_64.zip -d protoc3 \
+    && unzip protoc-30.2-linux-x86_64.zip -d protoc3 \
-    && mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc \
+    && mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc && mv protoc3/include/* /usr/local/include/ && rm -rf protoc-30.2-linux-x86_64.zip protoc3
-    && mv protoc3/include/* /usr/local/include/ && rm -rf protoc-31.1-linux-x86_64.zip protoc3
 
 # install flatc
 RUN wget https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.flatc.binary.g++-13.zip \
@@ -18,7 +17,10 @@ RUN wget https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.
     && mv flatc /usr/local/bin/ && chmod +x /usr/local/bin/flatc && rm -rf Linux.flatc.binary.g++-13.zip
 
 # install rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV RUSTUP_DIST_SERVER="https://rsproxy.cn"
+ENV RUSTUP_UPDATE_ROOT="https://rsproxy.cn/rustup"
+RUN curl -o rustup-init.sh --proto '=https' --tlsv1.2 -sSf https://rsproxy.cn/rustup-init.sh \
+    && sh rustup-init.sh -y && rm -rf rustup-init.sh
 
 COPY .docker/cargo.config.toml /root/.cargo/config.toml
 

.docker/cargo.config.toml

@@ -1,19 +1,13 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 [source.crates-io]
 registry = "https://github.com/rust-lang/crates.io-index"
+replace-with = 'rsproxy-sparse'
+
+[source.rsproxy]
+registry = "https://rsproxy.cn/crates.io-index"
+[registries.rsproxy]
+index = "https://rsproxy.cn/crates.io-index"
+[source.rsproxy-sparse]
+registry = "sparse+https://rsproxy.cn/index/"
 
 [net]
 git-fetch-with-cli = true

.docker/kms/docker-compose.yml

@@ -0,0 +1,26 @@
+services:
+  rustyvault:
+    build:
+      context: ./.docker
+      dockerfile: Dockerfile.rustyvault
+    container_name: rustyvault
+    hostname: rustyvault
+    ports:
+      - "8200:8200"  # Vault API port
+    volumes:
+      - vault-data:/vault/data
+      - vault-config:/vault/config
+    cap_add:
+      - IPC_LOCK  # Allow the vault to lock sensitive data in memory
+    environment:
+      - VAULT_DEV_ROOT_TOKEN_ID=rustfs-root-token
+      - VAULT_ADDR=http://0.0.0.0:8200
+    healthcheck:
+      test: ["CMD", "curl", "-s", "http://127.0.0.1:8200/v1/sys/health"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+
+networks:
+  default:
+    driver: bridge

.docker/mqtt/config/emqx.conf

@@ -1,37 +0,0 @@
-# 节点配置
-node.name = "emqx@127.0.0.1"
-node.cookie = "aBcDeFgHiJkLmNoPqRsTuVwXyZ012345"
-node.data_dir = "/opt/emqx/data"
-
-# 日志配置
-log.console = {level = info, enable = true}
-log.file = {path = "/opt/emqx/log/emqx.log", enable = true, level = info}
-
-# MQTT TCP 监听器
-listeners.tcp.default = {bind = "0.0.0.0:1883", max_connections = 1000000, enable = true}
-
-# MQTT SSL 监听器
-listeners.ssl.default = {bind = "0.0.0.0:8883", enable = false}
-
-# MQTT WebSocket 监听器
-listeners.ws.default = {bind = "0.0.0.0:8083", enable = true}
-
-# MQTT WebSocket SSL 监听器
-listeners.wss.default = {bind = "0.0.0.0:8084", enable = false}
-
-# 管理控制台
-dashboard.listeners.http = {bind = "0.0.0.0:18083", enable = true}
-
-# HTTP API
-management.listeners.http = {bind = "0.0.0.0:8081", enable = true}
-
-# 认证配置
-authentication = [
-  {enable = true, mechanism = password_based, backend = built_in_database, user_id_type = username}
-]
-
-# 授权配置
-authorization.sources = [{type = built_in_database, enable = true}]
-
-# 持久化消息存储
-message.storage.backend = built_in_database

.docker/mqtt/config/vm.args

@@ -1,9 +0,0 @@
--name emqx@127.0.0.1
--setcookie aBcDeFgHiJkLmNoPqRsTuVwXyZ012345
-+P 2097152
-+t 1048576
-+zdbbl 32768
--kernel inet_dist_listen_min 6000
--kernel inet_dist_listen_max 6100
--smp enable
--mnesia dir "/opt/emqx/data/mnesia"

.docker/mqtt/docker-compose-more.yml

@@ -1,74 +0,0 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-services:
-  emqx:
-    image: emqx/emqx:latest
-    container_name: emqx
-    restart: unless-stopped
-    environment:
-      - EMQX_NODE__NAME=emqx@127.0.0.1
-      - EMQX_NODE__COOKIE=aBcDeFgHiJkLmNoPqRsTuVwXyZ012345
-      - EMQX_NODE__DATA_DIR=/opt/emqx/data
-      - EMQX_LOG__CONSOLE__LEVEL=info
-      - EMQX_LOG__CONSOLE__ENABLE=true
-      - EMQX_LOG__FILE__PATH=/opt/emqx/log/emqx.log
-      - EMQX_LOG__FILE__LEVEL=info
-      - EMQX_LOG__FILE__ENABLE=true
-      - EMQX_LISTENERS__TCP__DEFAULT__BIND=0.0.0.0:1883
-      - EMQX_LISTENERS__TCP__DEFAULT__MAX_CONNECTIONS=1000000
-      - EMQX_LISTENERS__TCP__DEFAULT__ENABLE=true
-      - EMQX_LISTENERS__SSL__DEFAULT__BIND=0.0.0.0:8883
-      - EMQX_LISTENERS__SSL__DEFAULT__ENABLE=false
-      - EMQX_LISTENERS__WS__DEFAULT__BIND=0.0.0.0:8083
-      - EMQX_LISTENERS__WS__DEFAULT__ENABLE=true
-      - EMQX_LISTENERS__WSS__DEFAULT__BIND=0.0.0.0:8084
-      - EMQX_LISTENERS__WSS__DEFAULT__ENABLE=false
-      - EMQX_DASHBOARD__LISTENERS__HTTP__BIND=0.0.0.0:18083
-      - EMQX_DASHBOARD__LISTENERS__HTTP__ENABLE=true
-      - EMQX_MANAGEMENT__LISTENERS__HTTP__BIND=0.0.0.0:8081
-      - EMQX_MANAGEMENT__LISTENERS__HTTP__ENABLE=true
-      - EMQX_AUTHENTICATION__1__ENABLE=true
-      - EMQX_AUTHENTICATION__1__MECHANISM=password_based
-      - EMQX_AUTHENTICATION__1__BACKEND=built_in_database
-      - EMQX_AUTHENTICATION__1__USER_ID_TYPE=username
-      - EMQX_AUTHORIZATION__SOURCES__1__TYPE=built_in_database
-      - EMQX_AUTHORIZATION__SOURCES__1__ENABLE=true
-    ports:
-      - "1883:1883"    # MQTT TCP
-      - "8883:8883"    # MQTT SSL
-      - "8083:8083"    # MQTT WebSocket
-      - "8084:8084"    # MQTT WebSocket SSL
-      - "18083:18083"  # Web 管理控制台
-      - "8081:8081"    # HTTP API
-    volumes:
-      - ./data:/opt/emqx/data
-      - ./log:/opt/emqx/log
-      - ./config:/opt/emqx/etc
-    networks:
-      - mqtt-net
-    healthcheck:
-      test: [ "CMD", "/opt/emqx/bin/emqx_ctl", "status" ]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "3"
-
-networks:
-  mqtt-net:
-    driver: bridge

.docker/mqtt/docker-compose.yml

@@ -1,29 +0,0 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-services:
-  emqx:
-    image: emqx/emqx:latest
-    container_name: emqx
-    ports:
-      - "1883:1883"
-      - "8083:8083"
-      - "8084:8084"
-      - "8883:8883"
-      - "18083:18083"
-    restart: unless-stopped
-
-networks:
-  default:
-    driver: bridge

.docker/observability/README_ZH.md

@@ -22,6 +22,21 @@ docker compose -f docker-compose.yml  up -d
 
 ## 配置可观测性
 
-```shell
+### 创建配置文件
-export RUSTFS_OBS_ENDPOINT="http://localhost:4317" # OpenTelemetry Collector 地址
+
-```
+1. 进入 `deploy/config` 目录
+2. 复制示例配置：`cp obs.toml.example obs.toml`
+3. 编辑 `obs.toml` 配置文件，修改以下关键参数：
+
+| 配置项             | 说明                         | 示例值                   |
+|-----------------|----------------------------|-----------------------|
+| endpoint        | OpenTelemetry Collector 地址 | http://localhost:4317 |
+| service_name    | 服务名称                       | rustfs                |
+| service_version | 服务版本                       | 1.0.0                 |
+| environment     | 运行环境                       | production            |
+| meter_interval  | 指标导出间隔 (秒)               | 30                  |
+| sample_ratio    | 采样率                        | 1.0                   |
+| use_stdout      | 是否输出到控制台                   | true/false            |
+| logger_level    | 日志级别                       | info                  |
+
+```

.docker/observability/config/obs-multi.toml

@@ -0,0 +1,34 @@
+[observability]
+endpoint = "http://otel-collector:4317" # Default is "http://localhost:4317" if not specified
+use_stdout = false # Output with stdout, true output, false no output
+sample_ratio = 2.0
+meter_interval = 30
+service_name = "rustfs"
+service_version = "0.1.0"
+environments = "production"
+logger_level = "debug"
+local_logging_enabled = true
+
+#[[sinks]]
+#type = "Kafka"
+#brokers = "localhost:9092"
+#topic = "logs"
+#batch_size = 100 # Default is 100 if not specified
+#batch_timeout_ms = 1000 # Default is 1000ms if not specified
+#
+#[[sinks]]
+#type = "Webhook"
+#endpoint = "http://localhost:8080/webhook"
+#auth_token = ""
+#batch_size = 100 # Default is 3 if not specified
+#batch_timeout_ms = 1000 # Default is 100ms if not specified
+
+[[sinks]]
+type = "File"
+path = "/root/data/logs/rustfs.log"
+buffer_size = 100 # Default is 8192 bytes if not specified
+flush_interval_ms = 1000
+flush_threshold = 100
+
+[logger]
+queue_capacity = 10

.docker/observability/config/obs.toml

@@ -0,0 +1,34 @@
+[observability]
+endpoint = "http://localhost:4317" # Default is "http://localhost:4317" if not specified
+use_stdout = false # Output with stdout, true output, false no output
+sample_ratio = 2.0
+meter_interval = 30
+service_name = "rustfs"
+service_version = "0.1.0"
+environments = "production"
+logger_level = "debug"
+local_logging_enabled = true
+
+#[[sinks]]
+#type = "Kafka"
+#brokers = "localhost:9092"
+#topic = "logs"
+#batch_size = 100 # Default is 100 if not specified
+#batch_timeout_ms = 1000 # Default is 1000ms if not specified
+#
+#[[sinks]]
+#type = "Webhook"
+#endpoint = "http://localhost:8080/webhook"
+#auth_token = ""
+#batch_size = 100 # Default is 3 if not specified
+#batch_timeout_ms = 1000 # Default is 100ms if not specified
+
+[[sinks]]
+type = "File"
+path = "/root/data/logs/rustfs.log"
+buffer_size = 100 # Default is 8192 bytes if not specified
+flush_interval_ms = 1000
+flush_threshold = 100
+
+[logger]
+queue_capacity = 10

.docker/observability/docker-compose.yml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 services:
   otel-collector:
     image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.127.0
@@ -30,7 +16,7 @@ services:
     networks:
       - otel-network
   jaeger:
-    image: jaegertracing/jaeger:2.7.0
+    image: jaegertracing/jaeger:2.6.0
     environment:
       - TZ=Asia/Shanghai
     ports:
@@ -61,7 +47,7 @@ services:
     networks:
       - otel-network
   grafana:
-    image: grafana/grafana:12.0.2
+    image: grafana/grafana:12.0.1
     ports:
       - "3000:3000"  # Web UI
     environment:

.docker/observability/jaeger-config.yaml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 service:
   extensions: [ jaeger_storage, jaeger_query, remote_sampling, healthcheckv2 ]
   pipelines:
@@ -64,10 +50,10 @@ extensions:
     backends:
       some_store:
         memory:
-          max_traces: 1000000
+          max_traces: 100000
       another_store:
         memory:
-          max_traces: 1000000
+          max_traces: 100000
     metric_backends:
       some_metrics_storage:
         prometheus:

.docker/observability/loki-config.yaml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 auth_enabled: false
 
 server:

.docker/observability/otel-collector-config.yaml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 receivers:
   otlp:
     protocols:

.docker/observability/prometheus.yml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 global:
   scrape_interval: 5s  # 刮取间隔
 

.docker/openobserve-otel/docker-compose.yml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 services:
   openobserve:
     image: public.ecr.aws/zinclabs/openobserve:latest

.docker/openobserve-otel/otel-collector-config.yaml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 receivers:
   otlp:
     protocols:

.docker/vault-init.sh

@@ -0,0 +1,71 @@
+#!/bin/sh
+# vault-init.sh - Initialize Vault for RustFS SSE-KMS
+
+# Wait for Vault to start
+until curl -s http://127.0.0.1:8200/v1/sys/health | grep "initialized" > /dev/null; do
+    echo "Waiting for Vault to start..."
+    sleep 1
+done
+
+# Set the Vault token
+export VAULT_TOKEN="$VAULT_DEV_ROOT_TOKEN_ID"
+export VAULT_ADDR="http://127.0.0.1:8200"
+
+echo "Vault is running and initialized"
+
+# Enable the Transit secrets engine (for encryption operations)
+vault secrets enable transit
+echo "Transit secrets engine enabled"
+
+# Create a key for RustFS encryption
+vault write -f transit/keys/rustfs-encryption-key
+echo "Created rustfs-encryption-key"
+
+# Create another key for RustFS with rotation capability
+vault write -f transit/keys/rustfs-rotating-key
+echo "Created rustfs-rotating-key"
+
+# Set up key rotation policy
+vault write transit/keys/rustfs-rotating-key/config auto_rotate_period="30d"
+echo "Set up auto rotation for rustfs-rotating-key"
+
+# Create a policy for RustFS to access these keys
+cat > /tmp/rustfs-policy.hcl << EOF
+# Policy for RustFS encryption operations
+path "transit/encrypt/rustfs-encryption-key" {
+  capabilities = ["create", "update"]
+}
+
+path "transit/decrypt/rustfs-encryption-key" {
+  capabilities = ["create", "update"]
+}
+
+path "transit/encrypt/rustfs-rotating-key" {
+  capabilities = ["create", "update"]
+}
+
+path "transit/decrypt/rustfs-rotating-key" {
+  capabilities = ["create", "update"]
+}
+EOF
+
+# Create the policy
+vault policy write rustfs-encryption-policy /tmp/rustfs-policy.hcl
+echo "Created rustfs-encryption-policy"
+
+# Create a token for RustFS to use
+RUSTFS_TOKEN=$(vault token create -policy=rustfs-encryption-policy -field=token)
+echo "Created token for RustFS: $RUSTFS_TOKEN"
+
+# Store the token for RustFS to use
+echo "RUSTFS_KMS_VAULT_TOKEN=$RUSTFS_TOKEN" > /vault/config/rustfs-kms.env
+echo "RUSTFS_KMS_VAULT_ENDPOINT=http://rustyvault:8200" >> /vault/config/rustfs-kms.env
+echo "RUSTFS_KMS_VAULT_KEY_NAME=rustfs-encryption-key" >> /vault/config/rustfs-kms.env
+
+echo "RustFS KMS configuration has been created"
+echo "============================================"
+echo "Vault is ready for use with RustFS SSE-KMS"
+echo "============================================"
+
+# Keep the container running
+tail -f /dev/null

.github/actions/setup/action.yml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 name: "setup"
 
 description: "setup environment for rustfs"
@@ -27,9 +13,9 @@ inputs:
     description: "Cache key for shared cache"
   cache-save-if:
     required: true
-    default: ${{ github.ref == 'refs/heads/main' }}
+    default: true
     description: "Cache save condition"
-  runs-on:
+  run-os:
     required: true
     default: "ubuntu-latest"
     description: "Running system"
@@ -38,7 +24,7 @@ runs:
   using: "composite"
   steps:
     - name: Install system dependencies
-      if: inputs.runs-on == 'ubuntu-latest'
+      if: inputs.run-os == 'ubuntu-latest'
       shell: bash
       run: |
         sudo apt update
@@ -46,11 +32,11 @@ runs:
 
     - uses: arduino/setup-protoc@v3
       with:
-        version: "31.1"
+        version: "30.2"
 
     - uses: Nugine/setup-flatc@v1
       with:
-        version: "25.2.10"
+        version: "24.3.25"
 
     - uses: dtolnay/rust-toolchain@master
       with:
@@ -59,6 +45,7 @@ runs:
 
     - uses: Swatinem/rust-cache@v2
       with:
+        cache-on-failure: true
         cache-all-crates: true
         shared-key: ${{ inputs.cache-shared-key }}
         save-if: ${{ inputs.cache-save-if }}

.github/dependabot.yml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 # To get started with Dependabot version updates, you'll need to specify which
 # package ecosystems to update and where the package manifests are located.
 # Please see the documentation for all configuration options:

.github/workflows/audit.yml

@@ -1,30 +1,16 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 name: Audit
 
 on:
   push:
     branches:
       - main
-    paths:
+    paths: 
       - '**/Cargo.toml'
       - '**/Cargo.lock'
   pull_request:
     branches:
       - main
-    paths:
+    paths: 
       - '**/Cargo.toml'
       - '**/Cargo.lock'
   schedule:
@@ -34,6 +20,6 @@ jobs:
   audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v4
       - uses: taiki-e/install-action@cargo-audit
       - run: cargo audit -D warnings

.github/workflows/build.yml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 name: Build RustFS And GUI
 
 on:
@@ -19,132 +5,54 @@ on:
   schedule:
     - cron: "0 0 * * 0" # at midnight of each sunday
   push:
-    tags: ["v*", "*"]
     branches:
       - main
+    tags: [ "v*", "*" ]
 
 jobs:
   build-rustfs:
     runs-on: ${{ matrix.os }}
-    # Only execute in the following cases: 1) tag push 2) scheduled run 3) commit message contains --build
-    if: |
-      startsWith(github.ref, 'refs/tags/') ||
-      github.event_name == 'schedule' ||
-      github.event_name == 'workflow_dispatch' ||
-      contains(github.event.head_commit.message, '--build')
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
         variant:
-          - {
+          - { profile: release, target: x86_64-unknown-linux-musl, glibc: "default" }
-              profile: release,
+          - { profile: release, target: x86_64-unknown-linux-gnu, glibc: "default" }
-              target: x86_64-unknown-linux-musl,
-              glibc: "default",
-            }
-          - {
-              profile: release,
-              target: x86_64-unknown-linux-gnu,
-              glibc: "default",
-            }
           - { profile: release, target: aarch64-apple-darwin, glibc: "default" }
           #- { profile: release, target: aarch64-unknown-linux-gnu, glibc: "default" }
-          - {
+          - { profile: release, target: aarch64-unknown-linux-musl, glibc: "default" }
-              profile: release,
-              target: aarch64-unknown-linux-musl,
-              glibc: "default",
-            }
           #- { profile: release, target: x86_64-pc-windows-msvc, glibc: "default" }
         exclude:
           # Linux targets on non-Linux systems
           - os: macos-latest
-            variant:
+            variant: { profile: release, target: x86_64-unknown-linux-gnu, glibc: "default" }
-              {
-                profile: release,
-                target: x86_64-unknown-linux-gnu,
-                glibc: "default",
-              }
           - os: macos-latest
-            variant:
+            variant: { profile: release, target: x86_64-unknown-linux-musl, glibc: "default" }
-              {
-                profile: release,
-                target: x86_64-unknown-linux-musl,
-                glibc: "default",
-              }
           - os: macos-latest
-            variant:
+            variant: { profile: release, target: aarch64-unknown-linux-gnu, glibc: "default" }
-              {
-                profile: release,
-                target: aarch64-unknown-linux-gnu,
-                glibc: "default",
-              }
           - os: macos-latest
-            variant:
+            variant: { profile: release, target: aarch64-unknown-linux-musl, glibc: "default" }
-              {
-                profile: release,
-                target: aarch64-unknown-linux-musl,
-                glibc: "default",
-              }
           - os: windows-latest
-            variant:
+            variant: { profile: release, target: x86_64-unknown-linux-gnu, glibc: "default" }
-              {
-                profile: release,
-                target: x86_64-unknown-linux-gnu,
-                glibc: "default",
-              }
           - os: windows-latest
-            variant:
+            variant: { profile: release, target: x86_64-unknown-linux-musl, glibc: "default" }
-              {
-                profile: release,
-                target: x86_64-unknown-linux-musl,
-                glibc: "default",
-              }
           - os: windows-latest
-            variant:
+            variant: { profile: release, target: aarch64-unknown-linux-gnu, glibc: "default" }
-              {
-                profile: release,
-                target: aarch64-unknown-linux-gnu,
-                glibc: "default",
-              }
           - os: windows-latest
-            variant:
+            variant: { profile: release, target: aarch64-unknown-linux-musl, glibc: "default" }
-              {
-                profile: release,
-                target: aarch64-unknown-linux-musl,
-                glibc: "default",
-              }
 
           # Apple targets on non-macOS systems
           - os: ubuntu-latest
-            variant:
+            variant: { profile: release, target: aarch64-apple-darwin, glibc: "default" }
-              {
-                profile: release,
-                target: aarch64-apple-darwin,
-                glibc: "default",
-              }
           - os: windows-latest
-            variant:
+            variant: { profile: release, target: aarch64-apple-darwin, glibc: "default" }
-              {
-                profile: release,
-                target: aarch64-apple-darwin,
-                glibc: "default",
-              }
 
           # Windows targets on non-Windows systems
           - os: ubuntu-latest
-            variant:
+            variant: { profile: release, target: x86_64-pc-windows-msvc, glibc: "default" }
-              {
-                profile: release,
-                target: x86_64-pc-windows-msvc,
-                glibc: "default",
-              }
           - os: macos-latest
-            variant:
+            variant: { profile: release, target: x86_64-pc-windows-msvc, glibc: "default" }
-              {
-                profile: release,
-                target: x86_64-pc-windows-msvc,
-                glibc: "default",
-              }
 
     steps:
       - name: Checkout repository
@@ -173,7 +81,7 @@ jobs:
         uses: actions/cache@v4.2.3
         with:
           path: /Users/runner/hostedtoolcache/protoc
-          key: protoc-${{ runner.os }}-31.1
+          key: protoc-${{ runner.os }}-30.2
           restore-keys: |
             protoc-${{ runner.os }}-
 
@@ -181,7 +89,7 @@ jobs:
         if: steps.cache-protoc.outputs.cache-hit != 'true'
         uses: arduino/setup-protoc@v3
         with:
-          version: "31.1"
+          version: '30.2'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Flatc
@@ -199,10 +107,10 @@ jobs:
 
       # Set up Zig for cross-compilation
       - uses: mlugg/setup-zig@v2
-        if: matrix.variant.glibc != 'default' || contains(matrix.variant.target, 'aarch64-unknown-linux')
+        if: matrix.variant.glibc != 'default' || contains(matrix.variant.target, 'linux')
 
       - uses: taiki-e/install-action@cargo-zigbuild
-        if: matrix.variant.glibc != 'default' || contains(matrix.variant.target, 'aarch64-unknown-linux')
+        if: matrix.variant.glibc != 'default' || contains(matrix.variant.target, 'linux')
 
       # Download static resources
       - name: Download and Extract Static Assets
@@ -242,7 +150,7 @@ jobs:
 
           # Determine whether to use zigbuild
           USE_ZIGBUILD=false
-          if [[ "$GLIBC" != "default" || "$TARGET" == *"aarch64-unknown-linux"* ]]; then
+          if [[ "$GLIBC" != "default" || "$TARGET" == *"linux"* ]]; then
             USE_ZIGBUILD=true
             echo "Using zigbuild for cross-compilation"
           fi
@@ -272,14 +180,14 @@ jobs:
           if [[ "$GLIBC" != "default" ]]; then
             BIN_NAME="${BIN_NAME}.glibc${GLIBC}"
           fi
-
+          
           # Windows systems use exe suffix, and other systems do not have suffix
           if [[ "${{ matrix.variant.target }}" == *"windows"* ]]; then
             BIN_NAME="${BIN_NAME}.exe"
           else
             BIN_NAME="${BIN_NAME}.bin"
           fi
-
+          
           echo "Binary name will be: $BIN_NAME"
 
           echo "::group::Building rustfs"
@@ -357,89 +265,17 @@ jobs:
           path: ${{ steps.package.outputs.artifact_name }}.zip
           retention-days: 7
 
-      # Install ossutil2 tool for OSS upload
-      - name: Install ossutil2
-        if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main'
-        shell: bash
-        run: |
-          echo "::group::Installing ossutil2"
-          # Download and install ossutil based on platform
-          if [ "${{ runner.os }}" = "Linux" ]; then
-            curl -o ossutil.zip https://gosspublic.alicdn.com/ossutil/v2/2.1.1/ossutil-2.1.1-linux-amd64.zip
-            unzip -o ossutil.zip
-            chmod 755 ossutil-2.1.1-linux-amd64/ossutil
-            sudo mv ossutil-2.1.1-linux-amd64/ossutil /usr/local/bin/
-            rm -rf ossutil.zip ossutil-2.1.1-linux-amd64
-          elif [ "${{ runner.os }}" = "macOS" ]; then
-            if [ "$(uname -m)" = "arm64" ]; then
-              curl -o ossutil.zip https://gosspublic.alicdn.com/ossutil/v2/2.1.1/ossutil-2.1.1-mac-arm64.zip
-            else
-              curl -o ossutil.zip https://gosspublic.alicdn.com/ossutil/v2/2.1.1/ossutil-2.1.1-mac-amd64.zip
-            fi
-            unzip -o ossutil.zip
-            chmod 755 ossutil-*/ossutil
-            sudo mv ossutil-*/ossutil /usr/local/bin/
-            rm -rf ossutil.zip ossutil-*
-          elif [ "${{ runner.os }}" = "Windows" ]; then
-            curl -o ossutil.zip https://gosspublic.alicdn.com/ossutil/v2/2.1.1/ossutil-2.1.1-windows-amd64.zip
-            unzip -o ossutil.zip
-            mv ossutil-*/ossutil.exe /usr/bin/ossutil.exe
-            rm -rf ossutil.zip ossutil-*
-          fi
-          echo "ossutil2 installation completed"
-
       - name: Upload to Aliyun OSS
         if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main'
-        shell: bash
+        uses: JohnGuan/oss-upload-action@main
-        env:
+        with:
-          OSS_ACCESS_KEY_ID: ${{ secrets.ALICLOUDOSS_KEY_ID }}
+          key-id: ${{ secrets.ALICLOUDOSS_KEY_ID }}
-          OSS_ACCESS_KEY_SECRET: ${{ secrets.ALICLOUDOSS_KEY_SECRET }}
+          key-secret: ${{ secrets.ALICLOUDOSS_KEY_SECRET }}
-          OSS_REGION: cn-beijing
+          region: oss-cn-beijing
-          OSS_ENDPOINT: https://oss-cn-beijing.aliyuncs.com
+          bucket: rustfs-artifacts
-        run: |
+          assets: |
-          echo "::group::Uploading files to OSS"
+            ${{ steps.package.outputs.artifact_name }}.zip:/artifacts/rustfs/${{ steps.package.outputs.artifact_name }}.zip
-          # Upload the artifact file to two different paths
+            ${{ steps.package.outputs.artifact_name }}.zip:/artifacts/rustfs/${{ steps.package.outputs.artifact_name }}.latest.zip  
-          ossutil cp "${{ steps.package.outputs.artifact_name }}.zip" "oss://rustfs-artifacts/artifacts/rustfs/${{ steps.package.outputs.artifact_name }}.zip" --force
-          ossutil cp "${{ steps.package.outputs.artifact_name }}.zip" "oss://rustfs-artifacts/artifacts/rustfs/${{ steps.package.outputs.artifact_name }}.latest.zip" --force
-          echo "Successfully uploaded artifacts to OSS"
-
-      # Create and upload latest version info
-      - name: Create and Upload latest.json
-        if: startsWith(github.ref, 'refs/tags/') && matrix.os == 'ubuntu-latest' && matrix.variant.target == 'x86_64-unknown-linux-musl'
-        shell: bash
-        env:
-          OSS_ACCESS_KEY_ID: ${{ secrets.ALICLOUDOSS_KEY_ID }}
-          OSS_ACCESS_KEY_SECRET: ${{ secrets.ALICLOUDOSS_KEY_SECRET }}
-          OSS_REGION: cn-beijing
-          OSS_ENDPOINT: https://oss-cn-beijing.aliyuncs.com
-        run: |
-          echo "::group::Creating latest.json file"
-
-          # Extract version from tag (remove 'refs/tags/' prefix)
-          VERSION="${GITHUB_REF#refs/tags/}"
-          # Remove 'v' prefix if present
-          VERSION="${VERSION#v}"
-
-          # Get current timestamp in ISO 8601 format
-          RELEASE_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-
-          # Create latest.json content
-          cat > latest.json << EOF
-          {
-            "version": "${VERSION}",
-            "release_date": "${RELEASE_DATE}",
-            "release_notes": "Release ${VERSION}",
-            "download_url": "https://github.com/rustfs/rustfs/releases/tag/${GITHUB_REF#refs/tags/}"
-          }
-          EOF
-
-          echo "Generated latest.json:"
-          cat latest.json
-
-          echo "::group::Uploading latest.json to OSS"
-          # Upload latest.json to rustfs-version bucket
-          ossutil cp latest.json "oss://rustfs-version/latest.json" --force
-          echo "Successfully uploaded latest.json to OSS"
 
       # Determine whether to perform GUI construction based on conditions
       - name: Prepare for GUI build
@@ -557,23 +393,20 @@ jobs:
       # Upload GUI to Alibaba Cloud OSS
       - name: Upload GUI to Aliyun OSS
         if: startsWith(github.ref, 'refs/tags/')
-        shell: bash
+        uses: JohnGuan/oss-upload-action@main
-        env:
+        with:
-          OSS_ACCESS_KEY_ID: ${{ secrets.ALICLOUDOSS_KEY_ID }}
+          key-id: ${{ secrets.ALICLOUDOSS_KEY_ID }}
-          OSS_ACCESS_KEY_SECRET: ${{ secrets.ALICLOUDOSS_KEY_SECRET }}
+          key-secret: ${{ secrets.ALICLOUDOSS_KEY_SECRET }}
-          OSS_REGION: cn-beijing
+          region: oss-cn-beijing
-          OSS_ENDPOINT: https://oss-cn-beijing.aliyuncs.com
+          bucket: rustfs-artifacts
-        run: |
+          assets: |
-          echo "::group::Uploading GUI files to OSS"
+            ${{ steps.build_gui.outputs.gui_artifact_name }}.zip:/artifacts/rustfs/${{ steps.build_gui.outputs.gui_artifact_name }}.zip
-          # Upload the GUI artifact file to two different paths
+            ${{ steps.build_gui.outputs.gui_artifact_name }}.zip:/artifacts/rustfs/${{ steps.build_gui.outputs.gui_artifact_name }}.latest.zip
-          ossutil cp "${{ steps.build_gui.outputs.gui_artifact_name }}.zip" "oss://rustfs-artifacts/artifacts/rustfs/${{ steps.build_gui.outputs.gui_artifact_name }}.zip" --force
+
-          ossutil cp "${{ steps.build_gui.outputs.gui_artifact_name }}.zip" "oss://rustfs-artifacts/artifacts/rustfs/${{ steps.build_gui.outputs.gui_artifact_name }}.latest.zip" --force
-          echo "Successfully uploaded GUI artifacts to OSS"
 
   merge:
     runs-on: ubuntu-latest
-    needs: [build-rustfs]
+    needs: [ build-rustfs ]
-    # Only execute merge operation when tag is pushed
     if: startsWith(github.ref, 'refs/tags/')
     steps:
       - uses: actions/upload-artifact/merge@v4

.github/workflows/ci.yml

@@ -1,66 +1,19 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 name: CI
 
 on:
   push:
     branches:
       - main
-    paths-ignore:
-      - "**.md"
-      - "**.txt"
-      - "docs/**"
-      - "deploy/**"
-      - "scripts/dev_*.sh"
-      - "scripts/probe.sh"
-      - "LICENSE*"
-      - ".gitignore"
-      - ".dockerignore"
-      - "README*"
-      - "**/*.png"
-      - "**/*.jpg"
-      - "**/*.svg"
-      - ".github/workflows/build.yml"
-      - ".github/workflows/docker.yml"
-      - ".github/workflows/audit.yml"
-      - ".github/workflows/samply.yml"
   pull_request:
     branches:
       - main
-    paths-ignore:
-      - "**.md"
-      - "**.txt"
-      - "docs/**"
-      - "deploy/**"
-      - "scripts/dev_*.sh"
-      - "scripts/probe.sh"
-      - "LICENSE*"
-      - ".gitignore"
-      - ".dockerignore"
-      - "README*"
-      - "**/*.png"
-      - "**/*.jpg"
-      - "**/*.svg"
-      - ".github/workflows/build.yml"
-      - ".github/workflows/docker.yml"
-      - ".github/workflows/audit.yml"
-      - ".github/workflows/samply.yml"
   schedule:
-    - cron: "0 0 * * 0" # at midnight of each sunday
+    - cron: '0 0 * * 0' # at midnight of each sunday
   workflow_dispatch:
 
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
   skip-check:
     permissions:
@@ -73,54 +26,95 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          concurrent_skipping: "same_content_newer"
+          concurrent_skipping: 'same_content_newer'
           cancel_others: true
           paths_ignore: '["*.md"]'
 
-  develop:
+  # Quality checks for pull requests
-    needs: skip-check
+  pr-checks:
-    if: needs.skip-check.outputs.should_skip != 'true'
+    name: Pull Request Quality Checks
-    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
-    timeout-minutes: 60
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
 
-      - name: Test
+      - name: Format Check
+        run: cargo fmt --all --check
+
+      - name: Lint Check
+        run: cargo check --all-targets
+
+      - name: Clippy Check
+        run: cargo clippy --all-targets --all-features -- -D warnings
+
+      - name: Unit Tests
         run: cargo test --all --exclude e2e_test
 
+  develop:
+    needs: skip-check
+    if: needs.skip-check.outputs.should_skip != 'true'
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup
+
       - name: Format
         run: cargo fmt --all --check
 
       - name: Lint
+        run: cargo check --all-targets
+
+      - name: Clippy
         run: cargo clippy --all-targets --all-features -- -D warnings
 
-  s3s-e2e:
+      - name: Test
-    name: E2E (s3s-e2e)
+        run: cargo test --all --exclude e2e_test
-    needs: skip-check
-    if: needs.skip-check.outputs.should_skip != 'true'
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v4.2.2
-      - uses: ./.github/actions/setup
-
-      - name: Install s3s-e2e
-        uses: taiki-e/cache-cargo-install-action@v2
-        with:
-          tool: s3s-e2e
-          git: https://github.com/Nugine/s3s.git
-          rev: b7714bfaa17ddfa9b23ea01774a1e7bbdbfc2ca3
 
       - name: Build debug
         run: |
           touch rustfs/build.rs
           cargo build -p rustfs --bins
 
-      - name: Run s3s-e2e
+      - name: Pack artifacts
         run: |
+          mkdir -p ./target/artifacts
+          cp target/debug/rustfs    ./target/artifacts/rustfs-debug
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: rustfs
+          path: ./target/artifacts/*
+
+  s3s-e2e:
+    name: E2E (s3s-e2e)
+    needs:
+      - skip-check
+      - develop
+    if: needs.skip-check.outputs.should_skip != 'true'
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          cache-all-crates: true
+
+      - name: Install s3s-e2e
+        run: |
+          cargo install s3s-e2e --git https://github.com/Nugine/s3s.git
           s3s-e2e --version
-          ./scripts/e2e-run.sh ./target/debug/rustfs /tmp/rustfs
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: rustfs
+          path: ./target/artifacts
+
+      - name: Run s3s-e2e
+        timeout-minutes: 10
+        run: |
+          ./scripts/e2e-run.sh ./target/artifacts/rustfs-debug /tmp/rustfs
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/docker.yml

@@ -1,242 +0,0 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Build and Push Docker Images
-
-on:
-  push:
-    tags:
-      - "v*"
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-  workflow_dispatch:
-    inputs:
-      push_to_registry:
-        description: "Push images to registry"
-        required: false
-        default: true
-        type: boolean
-
-env:
-  REGISTRY_IMAGE_DOCKERHUB: rustfs/rustfs
-  REGISTRY_IMAGE_GHCR: ghcr.io/${{ github.repository }}
-
-jobs:
-  # Skip duplicate job runs
-  skip-check:
-    permissions:
-      actions: write
-      contents: read
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: "same_content_newer"
-          cancel_others: true
-          paths_ignore: '["*.md", "docs/**"]'
-
-  # Build RustFS binary for different platforms
-  build-binary:
-    needs: skip-check
-    # Only execute in the following cases: 1) tag push 2) commit message contains --build 3) workflow_dispatch 4) PR
-    if: needs.skip-check.outputs.should_skip != 'true' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '--build') || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request')
-    strategy:
-      matrix:
-        include:
-          - target: x86_64-unknown-linux-musl
-            os: ubuntu-latest
-            arch: amd64
-            use_cross: false
-          - target: aarch64-unknown-linux-gnu
-            os: ubuntu-latest
-            arch: arm64
-            use_cross: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 120
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          target: ${{ matrix.target }}
-          components: rustfmt, clippy
-
-      - name: Install cross-compilation dependencies (native build)
-        if: matrix.use_cross == false
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y musl-tools
-
-      - name: Install cross tool (cross compilation)
-        if: matrix.use_cross == true
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cross
-
-      - name: Install protoc
-        uses: arduino/setup-protoc@v3
-        with:
-          version: "31.1"
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Install flatc
-        uses: Nugine/setup-flatc@v1
-        with:
-          version: "25.2.10"
-
-      - name: Cache cargo dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-${{ matrix.target }}-
-            ${{ runner.os }}-cargo-
-
-      - name: Generate protobuf code
-        run: cargo run --bin gproto
-
-      - name: Build RustFS binary (native)
-        if: matrix.use_cross == false
-        run: |
-          cargo build --release --target ${{ matrix.target }} --bin rustfs
-
-      - name: Build RustFS binary (cross)
-        if: matrix.use_cross == true
-        run: |
-          cross build --release --target ${{ matrix.target }} --bin rustfs
-
-      - name: Upload binary artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: rustfs-${{ matrix.arch }}
-          path: target/${{ matrix.target }}/release/rustfs
-          retention-days: 1
-
-  # Build and push multi-arch Docker images
-  build-images:
-    needs: [skip-check, build-binary]
-    if: needs.skip-check.outputs.should_skip != 'true'
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        image-type: [production, ubuntu, rockylinux, devenv]
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Download binary artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: ./artifacts
-
-      - name: Setup binary files
-        run: |
-          mkdir -p target/x86_64-unknown-linux-musl/release
-          mkdir -p target/aarch64-unknown-linux-gnu/release
-          cp artifacts/rustfs-amd64/rustfs target/x86_64-unknown-linux-musl/release/
-          cp artifacts/rustfs-arm64/rustfs target/aarch64-unknown-linux-gnu/release/
-          chmod +x target/*/release/rustfs
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Login to Docker Hub
-        if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to GitHub Container Registry
-        if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set Dockerfile and context
-        id: dockerfile
-        run: |
-          case "${{ matrix.image-type }}" in
-            production)
-              echo "dockerfile=Dockerfile" >> $GITHUB_OUTPUT
-              echo "context=." >> $GITHUB_OUTPUT
-              echo "suffix=" >> $GITHUB_OUTPUT
-              ;;
-            ubuntu)
-              echo "dockerfile=.docker/Dockerfile.ubuntu22.04" >> $GITHUB_OUTPUT
-              echo "context=." >> $GITHUB_OUTPUT
-              echo "suffix=-ubuntu22.04" >> $GITHUB_OUTPUT
-              ;;
-            rockylinux)
-              echo "dockerfile=.docker/Dockerfile.rockylinux9.3" >> $GITHUB_OUTPUT
-              echo "context=." >> $GITHUB_OUTPUT
-              echo "suffix=-rockylinux9.3" >> $GITHUB_OUTPUT
-              ;;
-            devenv)
-              echo "dockerfile=.docker/Dockerfile.devenv" >> $GITHUB_OUTPUT
-              echo "context=." >> $GITHUB_OUTPUT
-              echo "suffix=-devenv" >> $GITHUB_OUTPUT
-              ;;
-          esac
-
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.REGISTRY_IMAGE_DOCKERHUB }}
-            ${{ env.REGISTRY_IMAGE_GHCR }}
-          tags: |
-            type=ref,event=branch,suffix=${{ steps.dockerfile.outputs.suffix }}
-            type=ref,event=pr,suffix=${{ steps.dockerfile.outputs.suffix }}
-            type=semver,pattern={{version}},suffix=${{ steps.dockerfile.outputs.suffix }}
-            type=semver,pattern={{major}}.{{minor}},suffix=${{ steps.dockerfile.outputs.suffix }}
-            type=semver,pattern={{major}},suffix=${{ steps.dockerfile.outputs.suffix }}
-            type=raw,value=latest,suffix=${{ steps.dockerfile.outputs.suffix }},enable={{is_default_branch}}
-          flavor: |
-            latest=false
-
-      - name: Build and push multi-arch Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: ${{ steps.dockerfile.outputs.context }}
-          file: ${{ steps.dockerfile.outputs.dockerfile }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ (github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))) || github.event.inputs.push_to_registry == 'true' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha,scope=${{ matrix.image-type }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.image-type }}
-          build-args: |
-            BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}

.github/workflows/samply.yml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 name: Profile with Samply
 on:
   push:
@@ -21,7 +7,7 @@ jobs:
   profile:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v4
 
       - uses: dtolnay/rust-toolchain@nightly
         with:

.gitignore

@@ -10,6 +10,7 @@ rustfs/static/*
 !rustfs/static/.gitkeep
 vendor
 cli/rustfs-gui/embedded-rustfs/rustfs
+deploy/config/obs.toml
 *.log
 deploy/certs/*
 *jsonl
@@ -18,4 +19,3 @@ deploy/certs/*
 .cargo
 profile.json
 .docker/openobserve-otel/data
-*.zst

.vscode/launch.json

@@ -20,19 +20,33 @@
                 }
             },
             "env": {
-                "RUST_LOG": "rustfs=debug,ecstore=info,s3s=debug"
+                "RUST_LOG": "rustfs=debug,ecstore=info,s3s=debug",
+                "RUSTFS_VOLUMES": "./target/volume/test{0...3}",
+                "RUSTFS_ADDRESS": "[::]:9000",
+                "RUSTFS_CONSOLE_ENABLE": "true",
+                "RUSTFS_CONSOLE_ADDRESS": "[::]:9002",
+                "RUSTFS_SERVER_DOMAINS": "localhost:9000",
+                "RUSTFS_TLS_PATH": "./deploy/certs",
+                "RUSTFS_OBS_CONFIG": "./deploy/config/obs.example.toml",
+                "RUSTFS__OBSERVABILITY__ENDPOINT": "http://localhost:4317",
+                "RUSTFS__OBSERVABILITY__USE_STDOUT": "true",
+                "RUSTFS__OBSERVABILITY__SAMPLE_RATIO": "2.0",
+                "RUSTFS__OBSERVABILITY__METER_INTERVAL": "30",
+                "RUSTFS__OBSERVABILITY__SERVICE_NAME": "rustfs",
+                "RUSTFS__OBSERVABILITY__SERVICE_VERSION": "0.1.0",
+                "RUSTFS__OBSERVABILITY__ENVIRONMENT": "develop",
+                "RUSTFS__OBSERVABILITY__LOGGER_LEVEL": "info",
+                "RUSTFS__SINKS__FILE__ENABLED": "true",
+                "RUSTFS__SINKS__FILE__PATH": "./deploy/logs/rustfs.log",
+                "RUSTFS__SINKS__WEBHOOK__ENABLED": "false",
+                "RUSTFS__SINKS__WEBHOOK__ENDPOINT": "", 
+                "RUSTFS__SINKS__WEBHOOK__AUTH_TOKEN": "",
+                "RUSTFS__SINKS__KAFKA__ENABLED": "false",
+                "RUSTFS__SINKS__KAFKA__BOOTSTRAP_SERVERS": "",
+                "RUSTFS__SINKS__KAFKA__TOPIC": "",
+                "RUSTFS__LOGGER__QUEUE_CAPACITY": "10"
+
             },
-            "args": [
-                "--access-key",
-                "AKEXAMPLERUSTFS",
-                "--secret-key",
-                "SKEXAMPLERUSTFS",
-                "--address",
-                "0.0.0.0:9010",
-                "--domain-name",
-                "127.0.0.1:9010",
-                "./target/volume/test{0...4}"
-            ],
             "cwd": "${workspaceFolder}"
         },
         {
@@ -72,19 +86,6 @@
             },
             "args": [],
             "cwd": "${workspaceFolder}"
-        },
-        {
-            "name": "Debug executable target/debug/rustfs",
-            "type":  "lldb",
-            "request": "launch",
-            "program": "${workspaceFolder}/target/debug/rustfs",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            //"stopAtEntry": false,
-            //"preLaunchTask": "cargo build",
-            "sourceLanguages": [
-                "rust"
-            ],
         }
     ]
 }

Cargo.toml

@@ -1,49 +1,32 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 [workspace]
 members = [
-    "rustfs", # Core file system implementation
+    "appauth", # Application authentication and authorization
     "cli/rustfs-gui", # Graphical user interface client
-    "crates/appauth", # Application authentication and authorization
+    "common/common", # Shared utilities and data structures
-    "crates/common", # Shared utilities and data structures
+    "common/lock", # Distributed locking implementation
+    "common/protos", # Protocol buffer definitions
+    "common/workers", # Worker thread pools and task scheduling
     "crates/config", # Configuration management
-    "crates/crypto", # Cryptography and security features
+    "crates/event-notifier", # Event notification system
-    "crates/ecstore", # Erasure coding storage implementation
-    "crates/e2e_test", # End-to-end test suite
-    "crates/filemeta", # File metadata management
-    "crates/iam", # Identity and Access Management
-    "crates/lock", # Distributed locking implementation
-    "crates/madmin", # Management dashboard and admin API interface
-    "crates/notify", # Notification system for events
     "crates/obs", # Observability utilities
-    "crates/protos", # Protocol buffer definitions
-    "crates/rio", # Rust I/O utilities and abstractions
-    "crates/s3select-api", # S3 Select API interface
-    "crates/s3select-query", # S3 Select query engine
-    "crates/signer", # client signer
     "crates/utils", # Utility functions and helpers
-    "crates/workers", # Worker thread pools and task scheduling
+    "crypto", # Cryptography and security features
-    "crates/zip", # ZIP file handling and compression
+    "ecstore", # Erasure coding storage implementation
+    "e2e_test", # End-to-end test suite
+    "iam", # Identity and Access Management
+    "madmin", # Management dashboard and admin API interface
+    "rustfs", # Core file system implementation
+    "s3select/api", # S3 Select API interface
+    "s3select/query", # S3 Select query engine
+    "crates/zip",
 ]
 resolver = "2"
 
 [workspace.package]
-edition = "2024"
+edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/rustfs/rustfs"
-rust-version = "1.85"
+rust-version = "1.75"
 version = "0.0.1"
 
 [workspace.lints.rust]
@@ -53,82 +36,64 @@ unsafe_code = "deny"
 all = "warn"
 
 [workspace.dependencies]
-rustfs-s3select-api = { path = "crates/s3select-api", version = "0.0.1" }
+api = { path = "./s3select/api", version = "0.0.1" }
-rustfs-appauth = { path = "crates/appauth", version = "0.0.1" }
+appauth = { path = "./appauth", version = "0.0.1" }
-rustfs-common = { path = "crates/common", version = "0.0.1" }
+common = { path = "./common/common", version = "0.0.1" }
-rustfs-crypto = { path = "crates/crypto", version = "0.0.1" }
+crypto = { path = "./crypto", version = "0.0.1" }
-rustfs-ecstore = { path = "crates/ecstore", version = "0.0.1" }
+ecstore = { path = "./ecstore", version = "0.0.1" }
-rustfs-iam = { path = "crates/iam", version = "0.0.1" }
+iam = { path = "./iam", version = "0.0.1" }
-rustfs-lock = { path = "crates/lock", version = "0.0.1" }
+lock = { path = "./common/lock", version = "0.0.1" }
-rustfs-madmin = { path = "crates/madmin", version = "0.0.1" }
+madmin = { path = "./madmin", version = "0.0.1" }
-rustfs-policy = { path = "crates/policy", version = "0.0.1" }
+policy = { path = "./policy", version = "0.0.1" }
-rustfs-protos = { path = "crates/protos", version = "0.0.1" }
+protos = { path = "./common/protos", version = "0.0.1" }
-rustfs-s3select-query = { path = "crates/s3select-query", version = "0.0.1" }
+query = { path = "./s3select/query", version = "0.0.1" }
 rustfs = { path = "./rustfs", version = "0.0.1" }
 rustfs-zip = { path = "./crates/zip", version = "0.0.1" }
 rustfs-config = { path = "./crates/config", version = "0.0.1" }
 rustfs-obs = { path = "crates/obs", version = "0.0.1" }
-rustfs-notify = { path = "crates/notify", version = "0.0.1" }
+rustfs-event-notifier = { path = "crates/event-notifier", version = "0.0.1" }
 rustfs-utils = { path = "crates/utils", version = "0.0.1" }
-rustfs-rio = { path = "crates/rio", version = "0.0.1" }
+workers = { path = "./common/workers", version = "0.0.1" }
-rustfs-filemeta = { path = "crates/filemeta", version = "0.0.1" }
+tokio-tar = "0.3.1"
-rustfs-signer = { path = "crates/signer", version = "0.0.1" }
-rustfs-workers = { path = "crates/workers", version = "0.0.1" }
-aes-gcm = { version = "0.10.3", features = ["std"] }
-arc-swap = "1.7.1"
-argon2 = { version = "0.5.3", features = ["std"] }
 atoi = "2.0.0"
-async-channel = "2.3.1"
 async-recursion = "1.1.1"
 async-trait = "0.1.88"
-async-compression = { version = "0.4.0" }
 atomic_enum = "0.3.0"
-aws-sdk-s3 = "1.95.0"
+aws-sdk-s3 = "1.29.0"
 axum = "0.8.4"
 axum-extra = "0.10.1"
 axum-server = { version = "0.7.2", features = ["tls-rustls"] }
-base64-simd = "0.8.0"
+backon = "1.5.1"
-base64 = "0.22.1"
+blake2 = "0.10.6"
-brotli = "8.0.1"
+bytes = "1.10.1"
-bytes = { version = "1.10.1", features = ["serde"] }
 bytesize = "2.0.1"
 byteorder = "1.5.0"
-cfg-if = "1.0.1"
-chacha20poly1305 = { version = "0.10.1" }
 chrono = { version = "0.4.41", features = ["serde"] }
-clap = { version = "4.5.40", features = ["derive", "env"] }
+clap = { version = "4.5.39", features = ["derive", "env"] }
+config = "0.15.11"
 const-str = { version = "0.6.2", features = ["std", "proc"] }
-crc32fast = "1.4.2"
-criterion = { version = "0.5", features = ["html_reports"] }
-dashmap = "6.1.0"
 datafusion = "46.0.1"
 derive_builder = "0.20.2"
 dioxus = { version = "0.6.3", features = ["router"] }
 dirs = "6.0.0"
-enumset = "1.1.6"
 flatbuffers = "25.2.10"
-flate2 = "1.1.1"
+flexi_logger = { version = "0.30.2", features = ["trc"] }
-flexi_logger = { version = "0.31.2", features = ["trc", "dont_minimize_extra_stacks"] }
-form_urlencoded = "1.2.1"
 futures = "0.3.31"
 futures-core = "0.3.31"
 futures-util = "0.3.31"
 glob = "0.3.2"
 hex = "0.4.3"
-hex-simd = "0.8.0"
 highway = { version = "1.3.0" }
-hmac = "0.12.1"
 hyper = "1.6.0"
 hyper-util = { version = "0.1.14", features = [
     "tokio",
     "server-auto",
     "server-graceful",
 ] }
-hyper-rustls = "0.27.5"
 http = "1.3.1"
 http-body = "1.0.1"
 humantime = "2.2.0"
-ipnetwork = { version = "0.21.1", features = ["serde"] }
+include_dir = "0.7.4"
 jsonwebtoken = "9.3.1"
 keyring = { version = "3.6.2", features = [
     "apple-native",
@@ -138,9 +103,9 @@ keyring = { version = "3.6.2", features = [
 lazy_static = "1.5.0"
 libsystemd = { version = "0.7.2" }
 local-ip-address = "0.6.5"
-lz4 = "1.28.1"
 matchit = "0.8.4"
 md-5 = "0.10.6"
+mime = "0.3.17"
 mime_guess = "2.0.5"
 netif = "0.1.6"
 nix = { version = "0.30.1", features = ["fs"] }
@@ -164,20 +129,17 @@ opentelemetry-semantic-conventions = { version = "0.30.0", features = [
     "semconv_experimental",
 ] }
 parking_lot = "0.12.4"
-path-absolutize = "3.1.1"
-path-clean = "1.0.1"
-blake3 = { version = "1.8.2" }
-pbkdf2 = "0.12.2"
 percent-encoding = "2.3.1"
 pin-project-lite = "0.2.16"
+# pin-utils = "0.1.0"
 prost = "0.13.5"
 prost-build = "0.13.5"
-quick-xml = "0.37.5"
+protobuf = "3.7"
-rand = "0.9.1"
+rand = "0.8.5"
 rdkafka = { version = "0.37.0", features = ["tokio"] }
-reed-solomon-simd = { version = "3.0.1" }
+reed-solomon-erasure = { version = "6.0.0", features = ["simd-accel"] }
 regex = { version = "1.11.1" }
-reqwest = { version = "0.12.22", default-features = false, features = [
+reqwest = { version = "0.12.19", default-features = false, features = [
     "rustls-tls",
     "charset",
     "http2",
@@ -192,26 +154,22 @@ rfd = { version = "0.15.3", default-features = false, features = [
 ] }
 rmp = "0.8.14"
 rmp-serde = "1.3.0"
-rsa = "0.9.8"
 rumqttc = { version = "0.24" }
 rust-embed = { version = "8.7.2" }
-rust-i18n = { version = "3.1.4" }
 rustfs-rsc = "2025.506.1"
-rustls = { version = "0.23.28" }
+rustls = { version = "0.23.27" }
 rustls-pki-types = "1.12.0"
 rustls-pemfile = "2.2.0"
 s3s = { git = "https://github.com/Nugine/s3s.git", rev = "4733cdfb27b2713e832967232cbff413bb768c10" }
-shadow-rs = { version = "1.2.0", default-features = false }
+s3s-policy = { git = "https://github.com/Nugine/s3s.git", rev = "4733cdfb27b2713e832967232cbff413bb768c10" }
+shadow-rs = { version = "1.1.1", default-features = false }
 serde = { version = "1.0.219", features = ["derive"] }
-serde_json = { version = "1.0.140", features = ["raw_value"] }
+serde_json = "1.0.140"
-serde-xml-rs = "0.8.1"
 serde_urlencoded = "0.7.1"
-sha1 = "0.10.6"
+serde_with = "3.12.0"
 sha2 = "0.10.9"
-siphasher = "1.0.1"
+smallvec = { version = "1.15.0", features = ["serde"] }
-smallvec = { version = "1.15.1", features = ["serde"] }
 snafu = "0.8.6"
-snap = "1.1.1"
 socket2 = "0.5.10"
 strum = { version = "0.27.1", features = ["derive"] }
 sysinfo = "0.35.2"
@@ -226,12 +184,11 @@ time = { version = "0.3.41", features = [
     "serde",
 ] }
 tokio = { version = "1.45.1", features = ["fs", "rt-multi-thread"] }
-tokio-rustls = { version = "0.26.2", default-features = false }
-tokio-stream = { version = "0.1.17" }
-tokio-tar = "0.3.1"
-tokio-util = { version = "0.7.15", features = ["io", "compat"] }
 tonic = { version = "0.13.1", features = ["gzip"] }
 tonic-build = { version = "0.13.1" }
+tokio-rustls = { version = "0.26.2", default-features = false }
+tokio-stream = { version = "0.1.17" }
+tokio-util = { version = "0.7.15", features = ["io", "compat"] }
 tower = { version = "0.5.2", features = ["timeout"] }
 tower-http = { version = "0.6.6", features = ["cors"] }
 tracing = "0.1.41"
@@ -248,11 +205,8 @@ uuid = { version = "1.17.0", features = [
     "fast-rng",
     "macro-diagnostics",
 ] }
-wildmatch = { version = "2.4.0", features = ["serde"] }
 winapi = { version = "0.3.9" }
-xxhash-rust = { version = "0.8.15", features = ["xxh64", "xxh3"] }
+
-zip = "2.2.0"
-zstd = "0.13.3"
 
 [profile.wasm-dev]
 inherits = "dev"
@@ -266,6 +220,10 @@ inherits = "dev"
 
 [profile.release]
 opt-level = 3
+lto = "thin"
+codegen-units = 1
+panic = "abort"   # Optional, remove the panic expansion code
+strip = true      # strip symbol information to reduce binary size
 
 [profile.production]
 inherits = "release"

Dockerfile

@@ -1,47 +1,17 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 FROM alpine:latest
 
-# Install runtime dependencies
+# RUN apk add --no-cache <package-name>
-RUN apk add --no-cache \
-    ca-certificates \
-    tzdata \
-    && rm -rf /var/cache/apk/*
 
-# Create rustfs user and group
+WORKDIR /app
-RUN addgroup -g 1000 rustfs && \
-    adduser -D -s /bin/sh -u 1000 -G rustfs rustfs
 
-# Create data directories
+RUN mkdir -p /data/rustfs0  /data/rustfs1  /data/rustfs2  /data/rustfs3 
-RUN mkdir -p /data/rustfs && \
-    chown -R rustfs:rustfs /data 
 
-# Copy binary based on target architecture
+COPY ./target/x86_64-unknown-linux-musl/release/rustfs /app/rustfs
-COPY --chown=rustfs:rustfs \
-  target/*/release/rustfs \
-  /usr/local/bin/rustfs
 
-RUN chmod +x /usr/local/bin/rustfs
+RUN chmod +x /app/rustfs
 
-# Switch to non-root user
+EXPOSE 9000
-USER rustfs
+EXPOSE 9001
 
-# Expose ports
-EXPOSE 9000 9001
 
-VOLUME /data
+CMD ["/app/rustfs"]
-
-# Set default command
-CMD ["rustfs", "/data"]

Dockerfile.multi-stage

@@ -1,121 +0,0 @@
-# Multi-stage Dockerfile for RustFS
-# Supports cross-compilation for amd64 and arm64 architectures
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
-# Build stage
-FROM --platform=$BUILDPLATFORM rust:1.85-bookworm AS builder
-
-# Install required build dependencies
-RUN apt-get update && apt-get install -y \
-    wget \
-    git \
-    curl \
-    unzip \
-    gcc \
-    pkg-config \
-    libssl-dev \
-    lld \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install cross-compilation tools for ARM64
-RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
-        apt-get update && \
-        apt-get install -y gcc-aarch64-linux-gnu && \
-        rm -rf /var/lib/apt/lists/*; \
-    fi
-
-# Install protoc
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v31.1/protoc-31.1-linux-x86_64.zip \
-    && unzip protoc-31.1-linux-x86_64.zip -d protoc3 \
-    && mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc \
-    && mv protoc3/include/* /usr/local/include/ && rm -rf protoc-31.1-linux-x86_64.zip protoc3
-
-# Install flatc
-RUN wget https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.flatc.binary.g++-13.zip \
-    && unzip Linux.flatc.binary.g++-13.zip \
-    && mv flatc /usr/local/bin/ && chmod +x /usr/local/bin/flatc && rm -rf Linux.flatc.binary.g++-13.zip
-
-# Set up Rust targets based on platform
-RUN case "$TARGETPLATFORM" in \
-        "linux/amd64") rustup target add x86_64-unknown-linux-gnu ;; \
-        "linux/arm64") rustup target add aarch64-unknown-linux-gnu ;; \
-        *) echo "Unsupported platform: $TARGETPLATFORM" && exit 1 ;; \
-    esac
-
-# Set up environment for cross-compilation
-ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
-ENV CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
-ENV CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
-
-WORKDIR /usr/src/rustfs
-
-# Copy Cargo files for dependency caching
-COPY Cargo.toml Cargo.lock ./
-COPY */Cargo.toml ./*/
-
-# Create dummy main.rs files for dependency compilation
-RUN find . -name "Cargo.toml" -not -path "./Cargo.toml" | \
-    xargs -I {} dirname {} | \
-    xargs -I {} sh -c 'mkdir -p {}/src && echo "fn main() {}" > {}/src/main.rs'
-
-# Build dependencies only (cache layer)
-RUN case "$TARGETPLATFORM" in \
-        "linux/amd64") cargo build --release --target x86_64-unknown-linux-gnu ;; \
-        "linux/arm64") cargo build --release --target aarch64-unknown-linux-gnu ;; \
-    esac
-
-# Copy source code
-COPY . .
-
-# Generate protobuf code
-RUN cargo run --bin gproto
-
-# Build the actual application
-RUN case "$TARGETPLATFORM" in \
-        "linux/amd64") \
-            cargo build --release --target x86_64-unknown-linux-gnu --bin rustfs && \
-            cp target/x86_64-unknown-linux-gnu/release/rustfs /usr/local/bin/rustfs \
-            ;; \
-        "linux/arm64") \
-            cargo build --release --target aarch64-unknown-linux-gnu --bin rustfs && \
-            cp target/aarch64-unknown-linux-gnu/release/rustfs /usr/local/bin/rustfs \
-            ;; \
-    esac
-
-# Runtime stage - Ubuntu minimal for better compatibility
-FROM ubuntu:22.04
-
-# Install runtime dependencies
-RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    tzdata \
-    wget \
-    && rm -rf /var/lib/apt/lists/*
-
-# Create rustfs user and group
-RUN groupadd -g 1000 rustfs && \
-    useradd -d /app -g rustfs -u 1000 -s /bin/bash rustfs
-
-WORKDIR /app
-
-# Create data directories
-RUN mkdir -p /data/rustfs{0,1,2,3} && \
-    chown -R rustfs:rustfs /data /app
-
-# Copy binary from builder stage
-COPY --from=builder /usr/local/bin/rustfs /app/rustfs
-RUN chmod +x /app/rustfs && chown rustfs:rustfs /app/rustfs
-
-# Switch to non-root user
-USER rustfs
-
-# Expose ports
-EXPOSE 9000 9001
-
-# Health check
-HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-    CMD wget --no-verbose --tries=1 --spider http://localhost:9000/health || exit 1
-
-# Set default command
-CMD ["/app/rustfs"]

LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2024 Beijing Henghesha Technology Co., Ltd. 
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

Makefile

@@ -79,121 +79,3 @@ build: BUILD_CMD = /root/.cargo/bin/cargo build --release --bin rustfs --target-
 build:
 	$(DOCKER_CLI) build -t $(ROCKYLINUX_BUILD_IMAGE_NAME) -f $(DOCKERFILE_PATH)/Dockerfile.$(BUILD_OS) .
 	$(DOCKER_CLI) run --rm --name $(ROCKYLINUX_BUILD_CONTAINER_NAME) -v $(shell pwd):/root/s3-rustfs -it $(ROCKYLINUX_BUILD_IMAGE_NAME) $(BUILD_CMD)
-
-.PHONY: build-musl
-build-musl:
-	@echo "🔨 Building rustfs for x86_64-unknown-linux-musl..."
-	cargo build --target x86_64-unknown-linux-musl --bin rustfs -r
-
-.PHONY: build-gnu
-build-gnu:
-	@echo "🔨 Building rustfs for x86_64-unknown-linux-gnu..."
-	cargo build --target x86_64-unknown-linux-gnu --bin rustfs -r
-
-.PHONY: deploy-dev
-deploy-dev: build-musl
-	@echo "🚀 Deploying to dev server: $${IP}"
-	./scripts/dev_deploy.sh $${IP}
-
-# Multi-architecture Docker build targets
-.PHONY: docker-build-multiarch
-docker-build-multiarch:
-	@echo "🏗️ Building multi-architecture Docker images..."
-	./scripts/build-docker-multiarch.sh
-
-.PHONY: docker-build-multiarch-push
-docker-build-multiarch-push:
-	@echo "🚀 Building and pushing multi-architecture Docker images..."
-	./scripts/build-docker-multiarch.sh --push
-
-.PHONY: docker-build-multiarch-version
-docker-build-multiarch-version:
-	@if [ -z "$(VERSION)" ]; then \
-		echo "❌ 错误: 请指定版本, 例如: make docker-build-multiarch-version VERSION=v1.0.0"; \
-		exit 1; \
-	fi
-	@echo "🏗️ Building multi-architecture Docker images (version: $(VERSION))..."
-	./scripts/build-docker-multiarch.sh --version $(VERSION)
-
-.PHONY: docker-push-multiarch-version
-docker-push-multiarch-version:
-	@if [ -z "$(VERSION)" ]; then \
-		echo "❌ 错误: 请指定版本, 例如: make docker-push-multiarch-version VERSION=v1.0.0"; \
-		exit 1; \
-	fi
-	@echo "🚀 Building and pushing multi-architecture Docker images (version: $(VERSION))..."
-	./scripts/build-docker-multiarch.sh --version $(VERSION) --push
-
-.PHONY: docker-build-ubuntu
-docker-build-ubuntu:
-	@echo "🏗️ Building multi-architecture Ubuntu Docker images..."
-	./scripts/build-docker-multiarch.sh --type ubuntu
-
-.PHONY: docker-build-rockylinux
-docker-build-rockylinux:
-	@echo "🏗️ Building multi-architecture RockyLinux Docker images..."
-	./scripts/build-docker-multiarch.sh --type rockylinux
-
-.PHONY: docker-build-devenv
-docker-build-devenv:
-	@echo "🏗️ Building multi-architecture development environment Docker images..."
-	./scripts/build-docker-multiarch.sh --type devenv
-
-.PHONY: docker-build-all-types
-docker-build-all-types:
-	@echo "🏗️ Building all multi-architecture Docker image types..."
-	./scripts/build-docker-multiarch.sh --type production
-	./scripts/build-docker-multiarch.sh --type ubuntu
-	./scripts/build-docker-multiarch.sh --type rockylinux
-	./scripts/build-docker-multiarch.sh --type devenv
-
-.PHONY: docker-inspect-multiarch
-docker-inspect-multiarch:
-	@if [ -z "$(IMAGE)" ]; then \
-		echo "❌ 错误: 请指定镜像, 例如: make docker-inspect-multiarch IMAGE=rustfs/rustfs:latest"; \
-		exit 1; \
-	fi
-	@echo "🔍 Inspecting multi-architecture image: $(IMAGE)"
-	docker buildx imagetools inspect $(IMAGE)
-
-.PHONY: build-cross-all
-build-cross-all:
-	@echo "🔧 Building all target architectures..."
-	@if ! command -v cross &> /dev/null; then \
-		echo "📦 Installing cross..."; \
-		cargo install cross; \
-	fi
-	@echo "🔨 Generating protobuf code..."
-	cargo run --bin gproto || true
-	@echo "🔨 Building x86_64-unknown-linux-musl..."
-	cargo build --release --target x86_64-unknown-linux-musl --bin rustfs
-	@echo "🔨 Building aarch64-unknown-linux-gnu..."
-	cross build --release --target aarch64-unknown-linux-gnu --bin rustfs
-	@echo "✅ All architectures built successfully!"
-
-.PHONY: help-docker
-help-docker:
-	@echo "🐳 Docker 多架构构建帮助："
-	@echo ""
-	@echo "基本构建:"
-	@echo "  make docker-build-multiarch              # 构建多架构镜像（不推送）"
-	@echo "  make docker-build-multiarch-push         # 构建并推送多架构镜像"
-	@echo ""
-	@echo "版本构建:"
-	@echo "  make docker-build-multiarch-version VERSION=v1.0.0   # 构建指定版本"
-	@echo "  make docker-push-multiarch-version VERSION=v1.0.0    # 构建并推送指定版本"
-	@echo ""
-	@echo "镜像类型:"
-	@echo "  make docker-build-ubuntu                 # 构建 Ubuntu 镜像"
-	@echo "  make docker-build-rockylinux             # 构建 RockyLinux 镜像"
-	@echo "  make docker-build-devenv                 # 构建开发环境镜像"
-	@echo "  make docker-build-all-types              # 构建所有类型镜像"
-	@echo ""
-	@echo "辅助工具:"
-	@echo "  make build-cross-all                     # 构建所有架构的二进制文件"
-	@echo "  make docker-inspect-multiarch IMAGE=xxx  # 检查镜像的架构支持"
-	@echo ""
-	@echo "环境变量 (在推送时需要设置):"
-	@echo "  DOCKERHUB_USERNAME    Docker Hub 用户名"
-	@echo "  DOCKERHUB_TOKEN       Docker Hub 访问令牌"
-	@echo "  GITHUB_TOKEN          GitHub 访问令牌"

README.md

@@ -1,115 +1,94 @@
-[![RustFS](https://github.com/user-attachments/assets/547d72f7-d1f4-4763-b9a8-6040bad9251a)](https://rustfs.com)
+# RustFS
 
-<p align="center">RustFS is a high-performance distributed object storage software built using Rust</p>
+## English Documentation |[中文文档](README_ZH.md)
 
-<p align="center">
+### Prerequisites
-  <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-  <img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/rustfs/rustfs"/>
-  <img alt="Github Last Commit" src="https://img.shields.io/github/last-commit/rustfs/rustfs"/>
-  <img alt="Github Contributors" src="https://img.shields.io/github/contributors/rustfs/rustfs"/>
-  <img alt="GitHub closed issues" src="https://img.shields.io/github/issues-closed/rustfs/rustfs"/>
-  <img alt="Discord" src="https://img.shields.io/discord/1107178041848909847?label=discord"/>
-</p>
 
-<p align="center">
+| Package | Version | Download Link                                                                                                                    |
-  <a href="https://docs.rustfs.com/en/introduction.html">Getting Started</a>
+|---------|---------|----------------------------------------------------------------------------------------------------------------------------------|
-  · <a href="https://docs.rustfs.com/en/">Docs</a>
+| Rust    | 1.8.5+  | [rust-lang.org/tools/install](https://www.rust-lang.org/tools/install)                                                           |
-  · <a href="https://github.com/rustfs/rustfs/issues">Bug reports</a>
+| protoc  | 30.2+   | [protoc-30.2-linux-x86_64.zip](https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip) |
-  · <a href="https://github.com/rustfs/rustfs/discussions">Discussions</a>
+| flatc   | 24.0+   | [Linux.flatc.binary.g++-13.zip](https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.flatc.binary.g++-13.zip)  |
-</p>
 
-<p align="center">
+### Building RustFS
-English | <a href="https://github.com/rustfs/rustfs/blob/main/README_ZH.md">简体中文</a>
-</p>
 
-RustFS is a high-performance distributed object storage software built using Rust, one of the most popular languages worldwide. Along with MinIO, it shares a range of advantages such as simplicity, S3 compatibility, open-source nature, support for data lakes, AI, and big data. Furthermore, it has a better and more user-friendly open-source license in comparison to other storage systems, being constructed under the Apache license. As Rust serves as its foundation, RustFS provides faster speed and safer distributed features for high-performance object storage.
+#### Generate Protobuf Code
 
-## Features
+```bash
+cargo run --bin gproto
+```
 
-- **High Performance**: Built with Rust, ensuring speed and efficiency.
+#### Using Docker for Prerequisites
-- **Distributed Architecture**: Scalable and fault-tolerant design for large-scale deployments.
-- **S3 Compatibility**: Seamless integration with existing S3-compatible applications.
-- **Data Lake Support**: Optimized for big data and AI workloads.
-- **Open Source**: Licensed under Apache 2.0, encouraging community contributions and transparency.
-- **User-Friendly**: Designed with simplicity in mind, making it easy to deploy and manage.
 
-## RustFS vs MinIO
+```yaml
+- uses: arduino/setup-protoc@v3
+  with:
+    version: "30.2"
 
-Stress test server parameters
+- uses: Nugine/setup-flatc@v1
+  with:
+    version: "25.2.10"
+```
 
-|  Type  |  parameter   | Remark |
+#### Adding Console Web UI
-| - | - | - |
-|CPU | 2 Core | Intel Xeon(Sapphire Rapids) Platinum 8475B , 2.7/3.2 GHz|   |
-|Memory| 4GB |     |
-|Network | 15Gbp |      |
-|Driver  | 40GB x 4 |   IOPS 3800 / Driver |
-
-<https://github.com/user-attachments/assets/2e4979b5-260c-4f2c-ac12-c87fd558072a>
-
-### RustFS vs Other object storage
-
-| RustFS | Other object storage|
-| - | - |
-| Powerful Console | Simple and useless Console |
-| Developed based on Rust language, memory is safer | Developed in Go or C, with potential issues like memory GC/leaks |
-| Does not report logs to third-party countries  | Reporting logs to other third countries may violate national security laws |
-| Licensed under Apache, more business-friendly  | AGPL V3 License and other License, polluted open source and License traps, infringement of intellectual property rights |
-| Comprehensive S3 support, works with domestic and international cloud providers  | Full support for S3, but no local cloud vendor support |
-| Rust-based development, strong support for secure and innovative devices  | Poor support for edge gateways and secure innovative devices|
-| Stable commercial prices, free community support | High pricing, with costs up to $250,000 for 1PiB |
-| No risk | Intellectual property risks and risks of prohibited uses |
-
-## Quickstart
-
-To get started with RustFS, follow these steps:
-
-1. **Install RustFS**: Download the latest release from our [GitHub Releases](https://github.com/rustfs/rustfs/releases).
-2. **Run RustFS**: Use the provided binary to start the server.
 
+1. Download the latest console UI:
    ```bash
-   ./rustfs  /data
+   wget https://dl.rustfs.com/artifacts/console/rustfs-console-latest.zip
+   ```
+2. Create the static directory:
+   ```bash
+   mkdir -p ./rustfs/static
+   ```
+3. Extract and compile RustFS:
+   ```bash
+   unzip rustfs-console-latest.zip -d ./rustfs/static
+   cargo build
    ```
 
-3. **Access the Console**: Open your web browser and navigate to `http://localhost:9001` to access the RustFS console.
+### Running RustFS
-4. **Create a Bucket**: Use the console to create a new bucket for your objects.
-5. **Upload Objects**: You can upload files directly through the console or use S3-compatible APIs to interact with your RustFS instance.
 
-## Documentation
+#### Configuration
 
-For detailed documentation, including configuration options, API references, and advanced usage, please visit our [Documentation](https://docs.rustfs.com).
+Set the required environment variables:
 
-## Getting Help
+```bash
+# Basic config
+export RUSTFS_VOLUMES="./target/volume/test"
+export RUSTFS_ADDRESS="0.0.0.0:9000"
+export RUSTFS_CONSOLE_ENABLE=true
+export RUSTFS_CONSOLE_ADDRESS="0.0.0.0:9001"
 
-If you have any questions or need assistance, you can:
+# Observability config
+export RUSTFS_OBS_ENDPOINT="http://localhost:4317"
 
-- Check the [FAQ](https://github.com/rustfs/rustfs/discussions/categories/q-a) for common issues and solutions.
+# Event message configuration
-- Join our [GitHub Discussions](https://github.com/rustfs/rustfs/discussions) to ask questions and share your experiences.
+#export RUSTFS_EVENT_CONFIG="./deploy/config/event.toml"
-- Open an issue on our [GitHub Issues](https://github.com/rustfs/rustfs/issues) page for bug reports or feature requests.
 
-## Links
+```
 
-- [Documentation](https://docs.rustfs.com) - The manual you should read
+#### Start the service
-- [Changelog](https://github.com/rustfs/rustfs/releases) - What we broke and fixed
-- [GitHub Discussions](https://github.com/rustfs/rustfs/discussions) - Where the community lives
 
-## Contact
+```bash
+./rustfs /data/rustfs
+```
 
-- **Bugs**: [GitHub Issues](https://github.com/rustfs/rustfs/issues)
+### Observability Stack
-- **Business**: <hello@rustfs.com>
-- **Jobs**: <jobs@rustfs.com>
-- **General Discussion**: [GitHub Discussions](https://github.com/rustfs/rustfs/discussions)
-- **Contributing**: [CONTRIBUTING.md](CONTRIBUTING.md)
 
-## Contributors
+#### Deployment
 
-RustFS is a community-driven project, and we appreciate all contributions. Check out the [Contributors](https://github.com/rustfs/rustfs/graphs/contributors) page to see the amazing people who have helped make RustFS better.
+1. Navigate to the observability directory:
+   ```bash
+   cd .docker/observability
+   ```
 
-<a href="https://github.com/rustfs/rustfs/graphs/contributors">
+2. Start the observability stack:
-  <img src="https://contrib.rocks/image?repo=rustfs/rustfs" />
+   ```bash
-</a>
+   docker compose -f docker-compose.yml  up -d
+   ```
 
-## License
+#### Access Monitoring Dashboards
 
-[Apache 2.0](https://opensource.org/licenses/Apache-2.0)
+- Grafana: `http://localhost:3000` (credentials: `admin`/`admin`)
-
+- Jaeger: `http://localhost:16686`
-**RustFS** is a trademark of RustFS, Inc. All other trademarks are the property of their respective owners.
+- Prometheus: `http://localhost:9090`

README_ZH.md

@@ -1,115 +1,99 @@
-[![RustFS](https://github.com/user-attachments/assets/547d72f7-d1f4-4763-b9a8-6040bad9251a)](https://rustfs.com)
+# RustFS
 
-<p align="center">RustFS 是一个使用 Rust 构建的高性能分布式对象存储软件</p >
+## [English Documentation](README.md) ｜中文文档
 
-<p align="center">
+### 前置要求
-  <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-  <img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/rustfs/rustfs"/>
-  <img alt="Github Last Commit" src="https://img.shields.io/github/last-commit/rustfs/rustfs"/>
-  <img alt="Github Contributors" src="https://img.shields.io/github/contributors/rustfs/rustfs"/>
-  <img alt="GitHub closed issues" src="https://img.shields.io/github/issues-closed/rustfs/rustfs"/>
-  <img alt="Discord" src="https://img.shields.io/discord/1107178041848909847?label=discord"/>
-</p >
 
-<p align="center">
+| 软件包    | 版本     | 下载链接                                                                                                                             |
-  <a href="https://docs.rustfs.com/zh/introduction.html">快速开始</a >
+|--------|--------|----------------------------------------------------------------------------------------------------------------------------------|
-  · <a href="https://docs.rustfs.com/zh/">文档</a >
+| Rust   | 1.8.5+ | [rust-lang.org/tools/install](https://www.rust-lang.org/tools/install)                                                           |
-  · <a href="https://github.com/rustfs/rustfs/issues">问题报告</a >
+| protoc | 30.2+  | [protoc-30.2-linux-x86_64.zip](https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip) |
-  · <a href="https://github.com/rustfs/rustfs/discussions">讨论</a >
+| flatc  | 24.0+  | [Linux.flatc.binary.g++-13.zip](https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.flatc.binary.g++-13.zip)  |
-</p >
 
-<p align="center">
+### 构建 RustFS
-<a href="https://github.com/rustfs/rustfs/blob/main/README.md">English</a > | 简体中文
-</p >
 
-RustFS 是一个使用 Rust（全球最受欢迎的编程语言之一）构建的高性能分布式对象存储软件。与 MinIO 一样，它具有简单性、S3 兼容性、开源特性以及对数据湖、AI 和大数据的支持等一系列优势。此外，与其他存储系统相比，它采用 Apache 许可证构建，拥有更好、更用户友好的开源许可证。由于以 Rust 为基础，RustFS 为高性能对象存储提供了更快的速度和更安全的分布式功能。
+#### 生成 Protobuf 代码
 
-## 特性
+```bash
+cargo run --bin gproto
+```
 
-- **高性能**：使用 Rust 构建，确保速度和效率。
+#### 使用 Docker 安装依赖
-- **分布式架构**：可扩展且容错的设计，适用于大规模部署。
-- **S3 兼容性**：与现有 S3 兼容应用程序无缝集成。
-- **数据湖支持**：针对大数据和 AI 工作负载进行了优化。
-- **开源**：采用 Apache 2.0 许可证，鼓励社区贡献和透明度。
-- **用户友好**：设计简单，易于部署和管理。
 
-## RustFS vs MinIO
+```yaml
+- uses: arduino/setup-protoc@v3
+  with:
+    version: "30.2"
 
-压力测试服务器参数
+- uses: Nugine/setup-flatc@v1
+  with:
+    version: "25.2.10"
+```
 
-|  类型  |  参数   | 备注 |
+#### 添加控制台 Web UI
-| - | - | - |
-|CPU | 2 核心 | Intel Xeon(Sapphire Rapids) Platinum 8475B , 2.7/3.2 GHz|   |
-|内存| 4GB |     |
-|网络 | 15Gbp |      |
-|驱动器  | 40GB x 4 |   IOPS 3800 / 驱动器 |
-
-<https://github.com/user-attachments/assets/2e4979b5-260c-4f2c-ac12-c87fd558072a>
-
-### RustFS vs 其他对象存储
-
-| RustFS | 其他对象存储|
-| - | - |
-| 强大的控制台 | 简单且无用的控制台 |
-| 基于 Rust 语言开发，内存更安全 | 使用 Go 或 C 开发，存在内存 GC/泄漏等潜在问题 |
-| 不向第三方国家报告日志  | 向其他第三方国家报告日志可能违反国家安全法律 |
-| 采用 Apache 许可证，对商业更友好  | AGPL V3 许可证等其他许可证，污染开源和许可证陷阱，侵犯知识产权 |
-| 全面的 S3 支持，适用于国内外云提供商  | 完全支持 S3，但不支持本地云厂商 |
-| 基于 Rust 开发，对安全和创新设备有强大支持  | 对边缘网关和安全创新设备支持较差|
-| 稳定的商业价格，免费社区支持 | 高昂的定价，1PiB 成本高达 $250,000 |
-| 无风险 | 知识产权风险和禁止使用的风险 |
-
-## 快速开始
-
-要开始使用 RustFS，请按照以下步骤操作：
-
-1. **安装 RustFS**：从我们的 [GitHub Releases](https://github.com/rustfs/rustfs/releases) 下载最新版本。
-2. **运行 RustFS**：使用提供的二进制文件启动服务器。
 
+1. 下载最新的控制台 UI：
    ```bash
-   ./rustfs  /data
+   wget https://dl.rustfs.com/artifacts/console/rustfs-console-latest.zip
+   ```
+2. 创建静态资源目录：
+   ```bash
+   mkdir -p ./rustfs/static
+   ```
+3. 解压并编译 RustFS：
+   ```bash
+   unzip rustfs-console-latest.zip -d ./rustfs/static
+   cargo build
    ```
 
-3. **访问控制台**：打开 Web 浏览器并导航到 `http://localhost:9001` 以访问 RustFS 控制台。
+### 运行 RustFS
-4. **创建存储桶**：使用控制台为您的对象创建新的存储桶。
-5. **上传对象**：您可以直接通过控制台上传文件，或使用 S3 兼容的 API 与您的 RustFS 实例交互。
 
-## 文档
+#### 配置
 
-有关详细文档，包括配置选项、API 参考和高级用法，请访问我们的[文档](https://docs.rustfs.com)。
+设置必要的环境变量：
 
-## 获取帮助
+```bash
+# 基础配置
+export RUSTFS_VOLUMES="./target/volume/test"
+export RUSTFS_ADDRESS="0.0.0.0:9000"
+export RUSTFS_CONSOLE_ENABLE=true
+export RUSTFS_CONSOLE_ADDRESS="0.0.0.0:9001"
 
-如果您有任何问题或需要帮助，您可以：
+# 可观测性配置
+export RUSTFS_OBS_ENDPOINT="http://localhost:4317"
 
-- 查看[常见问题解答](https://github.com/rustfs/rustfs/discussions/categories/q-a)以获取常见问题和解决方案。
+# 事件消息配置
-- 加入我们的 [GitHub 讨论](https://github.com/rustfs/rustfs/discussions)来提问和分享您的经验。
+#export RUSTFS_EVENT_CONFIG="./deploy/config/event.toml"
-- 在我们的 [GitHub Issues](https://github.com/rustfs/rustfs/issues) 页面上开启问题，报告错误或功能请求。
+```
 
-## 链接
+#### 启动服务
 
-- [文档](https://docs.rustfs.com) - 您应该阅读的手册
+```bash
-- [更新日志](https://docs.rustfs.com/changelog) - 我们破坏和修复的内容
+./rustfs /data/rustfs
-- [GitHub 讨论](https://github.com/rustfs/rustfs/discussions) - 社区所在地
+```
 
-## 联系
+### 可观测性系统
 
-- **错误报告**：[GitHub Issues](https://github.com/rustfs/rustfs/issues)
+#### 部署
-- **商务合作**：<hello@rustfs.com>
-- **招聘**：<jobs@rustfs.com>
-- **一般讨论**：[GitHub 讨论](https://github.com/rustfs/rustfs/discussions)
-- **贡献**：[CONTRIBUTING.md](CONTRIBUTING.md)
 
-## 贡献者
+1. 进入可观测性目录：
+   ```bash
+   cd .docker/observability
+   ```
 
-RustFS 是一个社区驱动的项目，我们感谢所有的贡献。查看[贡献者](https://github.com/rustfs/rustfs/graphs/contributors)页面，了解帮助 RustFS 变得更好的杰出人员。
+2. 启动可观测性系统：
+   ```bash
+   docker compose -f docker-compose.yml  up -d
+   ```
 
-<a href="https://github.com/rustfs/rustfs/graphs/contributors">
+#### 访问监控面板
-  <img src="https://contrib.rocks/image?repo=rustfs/rustfs" />
-</a >
 
-## 许可证
+- Grafana: `http://localhost:3000` (默认账号/密码：`admin`/`admin`)
+- Jaeger: `http://localhost:16686`
+- Prometheus: `http://localhost:9090`
 
-[Apache 2.0](https://opensource.org/licenses/Apache-2.0)
+#### 配置可观测性
 
-**RustFS** 是 RustFS, Inc. 的商标。所有其他商标均为其各自所有者的财产。
+```
+OpenTelemetry Collector 地址(endpoint):  http://localhost:4317 
+```

SSE_KMS_IMPROVEMENTS.md

@@ -0,0 +1,154 @@
+# RustFS SSE-KMS 改进实现总结
+
+本次改进针对 RustFS 的 SSE-KMS 系统进行了四个主要增强，使其更符合 MinIO 标准并支持动态配置管理。
+
+## 实现的改进
+
+### 1. 创建 KMS 配置子系统 ✅
+
+**实现位置**: `crates/config/src/lib.rs`
+
+- 创建了统一的配置管理器 `ConfigManager`
+- 支持动态 KMS 配置的读取、设置和持久化
+- 提供线程安全的全局配置访问
+- 支持配置验证和错误处理
+
+**主要功能**:
+
+```rust
+// 全局配置管理器
+ConfigManager::global().get_kms_config("vault").await
+ConfigManager::global().set_kms_config("vault", config).await
+ConfigManager::global().validate_all_configs().await
+```
+
+### 2. KMS 配置查找和验证 ✅
+
+**实现位置**: `ecstore/src/config/kms.rs`
+
+- 实现了完整的 KMS 配置结构 `Config`
+- 支持环境变量和配置文件双重配置源
+- 提供配置验证和连接测试功能
+- 兼容 MinIO 的配置参数命名
+
+**主要特性**:
+
+- 支持 Vault 端点、密钥名称、认证 token 等配置
+- 自动验证配置完整性和有效性
+- 支持 TLS 配置和证书验证
+- 提供连接测试功能
+
+### 3. S3 标准元数据格式支持 ✅
+
+**实现位置**: `crypto/src/sse_kms.rs`
+
+- 实现了 MinIO 兼容的元数据格式
+- 支持标准 S3 SSE-KMS HTTP 头部
+- 提供元数据与 HTTP 头部的双向转换
+- 支持分片加密的元数据管理
+
+**标准头部支持**:
+
+```
+x-amz-server-side-encryption: aws:kms
+x-amz-server-side-encryption-aws-kms-key-id: key-id
+x-amz-server-side-encryption-context: context
+x-amz-meta-sse-kms-encrypted-key: encrypted-data-key
+x-amz-meta-sse-kms-iv: initialization-vector
+```
+
+### 4. 管理 API 支持动态配置 ✅
+
+**实现位置**: `rustfs/src/admin/handlers.rs` 和 `rustfs/src/admin/mod.rs`
+
+- 添加了 KMS 配置管理的 REST API 端点
+- 支持 MinIO 兼容的配置管理路径
+- 提供获取和设置配置的 HTTP 接口
+- 支持实时配置更新和验证
+
+**API 端点**:
+
+```
+GET  /minio/admin/v3/config          # 获取所有配置
+POST /minio/admin/v3/config/kms_vault/{target}  # 设置KMS配置
+GET  /rustfs/admin/v3/config         # RustFS原生配置API
+POST /rustfs/admin/v3/config/kms_vault/{target} # RustFS原生设置API
+```
+
+## 技术特性
+
+### 兼容性
+
+- ✅ 完全兼容 MinIO 的 SSE-KMS 配置格式
+- ✅ 支持标准 S3 SSE-KMS HTTP 头部
+- ✅ 兼容 MinIO Admin API 配置管理接口
+
+### 安全性
+
+- ✅ 支持 RustyVault KMS 集成
+- ✅ 数据密钥的安全生成和加密存储
+- ✅ 支持 TLS 连接和证书验证
+- ✅ 敏感配置信息的安全处理
+
+### 性能
+
+- ✅ 异步配置操作
+- ✅ 线程安全的全局配置缓存
+- ✅ 高效的元数据序列化/反序列化
+- ✅ 支持分片并行加密
+
+### 可维护性
+
+- ✅ 模块化设计，职责分离
+- ✅ 完整的错误处理和日志记录
+- ✅ 丰富的单元测试覆盖
+- ✅ 详细的文档和注释
+
+## 使用示例
+
+### 配置 KMS
+
+```bash
+# 通过环境变量配置
+export RUSTFS_KMS_ENABLED=true
+export RUSTFS_KMS_VAULT_ENDPOINT=http://vault:8200
+export RUSTFS_KMS_VAULT_KEY_NAME=rustfs-key
+export RUSTFS_KMS_VAULT_TOKEN=vault-token
+
+# 通过API配置
+curl -X POST "http://rustfs:9000/minio/admin/v3/config/kms_vault/default" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "endpoint": "http://vault:8200",
+    "key_name": "rustfs-encryption-key",
+    "token": "vault-token",
+    "enabled": true
+  }'
+```
+
+### 使用 SSE-KMS 上传对象
+
+```bash
+# 使用aws-cli上传加密对象
+aws s3 cp file.txt s3://bucket/file.txt \
+  --server-side-encryption aws:kms \
+  --ssekms-key-id rustfs-encryption-key
+```
+
+## 部署注意事项
+
+1. **RustyVault 集成**: 确保 RustyVault 服务可访问且已正确配置 transit 引擎
+2. **网络安全**: 建议在生产环境中使用 TLS 连接到 Vault
+3. **权限管理**: 确保 RustFS 具有访问 Vault 密钥的适当权限
+4. **监控**: 建议监控 KMS 连接状态和加密操作性能
+
+## 后续发展
+
+这次实现为 RustFS 的企业级加密功能奠定了坚实基础。未来可以考虑：
+
+- 支持多个 KMS 提供商（AWS KMS, Azure Key Vault 等）
+- 实现密钥轮换功能
+- 添加加密性能监控和优化
+- 支持更复杂的访问控制策略
+
+通过这些改进，RustFS 现在具备了与 MinIO 相当的 SSE-KMS 功能，可以满足企业级数据加密需求。

appauth/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "appauth"
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
+
+[dependencies]
+base64-simd = "0.8.0"
+common.workspace = true
+hex-simd = "0.8.0"
+rand.workspace = true
+rsa = "0.9.8"
+serde.workspace = true
+serde_json.workspace = true
+
+[lints]
+workspace = true

appauth/src/lib.rs

@@ -0,0 +1 @@
+pub mod token;

appauth/src/token.rs

@@ -1,25 +1,10 @@
-// Copyright 2024 RustFS Team
+use common::error::Result;
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use rsa::Pkcs1v15Encrypt;
 use rsa::{
-    RsaPrivateKey, RsaPublicKey,
     pkcs8::{DecodePrivateKey, DecodePublicKey},
-    rand_core::OsRng,
+    RsaPrivateKey, RsaPublicKey,
 };
 use serde::{Deserialize, Serialize};
-use std::io::{Error, Result};
 
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]
 pub struct Token {
@@ -33,8 +18,8 @@ pub struct Token {
 // 返回 base64 处理的加密字符串
 pub fn gencode(token: &Token, key: &str) -> Result<String> {
     let data = serde_json::to_vec(token)?;
-    let public_key = RsaPublicKey::from_public_key_pem(key).map_err(Error::other)?;
+    let public_key = RsaPublicKey::from_public_key_pem(key)?;
-    let encrypted_data = public_key.encrypt(&mut OsRng, Pkcs1v15Encrypt, &data).map_err(Error::other)?;
+    let encrypted_data = public_key.encrypt(&mut rand::thread_rng(), Pkcs1v15Encrypt, &data)?;
     Ok(base64_simd::URL_SAFE_NO_PAD.encode_to_string(&encrypted_data))
 }
 
@@ -43,11 +28,9 @@ pub fn gencode(token: &Token, key: &str) -> Result<String> {
 // [key] 私钥字符串
 // 返回 Token 对象
 pub fn parse(token: &str, key: &str) -> Result<Token> {
-    let encrypted_data = base64_simd::URL_SAFE_NO_PAD
+    let encrypted_data = base64_simd::URL_SAFE_NO_PAD.decode_to_vec(token.as_bytes())?;
-        .decode_to_vec(token.as_bytes())
+    let private_key = RsaPrivateKey::from_pkcs8_pem(key)?;
-        .map_err(Error::other)?;
+    let decrypted_data = private_key.decrypt(Pkcs1v15Encrypt, &encrypted_data)?;
-    let private_key = RsaPrivateKey::from_pkcs8_pem(key).map_err(Error::other)?;
-    let decrypted_data = private_key.decrypt(Pkcs1v15Encrypt, &encrypted_data).map_err(Error::other)?;
     let res: Token = serde_json::from_slice(&decrypted_data)?;
     Ok(res)
 }
@@ -66,19 +49,19 @@ pub fn parse_license(license: &str) -> Result<Token> {
     // }
 }
 
-static TEST_PRIVATE_KEY: &str = "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCj86SrJIuxSxR6\nBJ/dlJEUIj6NeBRnhLQlCDdovuz61+7kJXVcxaR66w4m8W7SLEUP+IlPtnn6vmiG\n7XMhGNHIr7r1JsEVVLhZmL3tKI66DEZl786ZhG81BWqUlmcooIPS8UEPZNqJXLuz\nVGhxNyVGbj/tV7QC2pSISnKaixc+nrhxvo7w56p5qrm9tik0PjTgfZsUePkoBsSN\npoRkAauS14MAzK6HGB75CzG3dZqXUNWSWVocoWtQbZUwFGXyzU01ammsHQDvc2xu\nK1RQpd1qYH5bOWZ0N0aPFwT0r59HztFXg9sbjsnuhO1A7OiUOkc6iGVuJ0wm/9nA\nwZIBqzgjAgMBAAECggEAPMpeSEbotPhNw2BrllE76ec4omPfzPJbiU+em+wPGoNu\nRJHPDnMKJbl6Kd5jZPKdOOrCnxfd6qcnQsBQa/kz7+GYxMV12l7ra+1Cnujm4v0i\nLTHZvPpp8ZLsjeOmpF3AAzsJEJgon74OqtOlVjVIUPEYKvzV9ijt4gsYq0zfdYv0\nhrTMzyrGM4/UvKLsFIBROAfCeWfA7sXLGH8JhrRAyDrtCPzGtyyAmzoHKHtHafcB\nuyPFw/IP8otAgpDk5iiQPNkH0WwzAQIm12oHuNUa66NwUK4WEjXTnDg8KeWLHHNv\nIfN8vdbZchMUpMIvvkr7is315d8f2cHCB5gEO+GWAQKBgQDR/0xNll+FYaiUKCPZ\nvkOCAd3l5mRhsqnjPQ/6Ul1lAyYWpoJSFMrGGn/WKTa/FVFJRTGbBjwP+Mx10bfb\ngUg2GILDTISUh54fp4zngvTi9w4MWGKXrb7I1jPkM3vbJfC/v2fraQ/r7qHPpO2L\nf6ZbGxasIlSvr37KeGoelwcAQQKBgQDH3hmOTS2Hl6D4EXdq5meHKrfeoicGN7m8\noQK7u8iwn1R9zK5nh6IXxBhKYNXNwdCQtBZVRvFjjZ56SZJb7lKqa1BcTsgJfZCy\nnI3Uu4UykrECAH8AVCVqBXUDJmeA2yE+gDAtYEjvhSDHpUfWxoGHr0B/Oqk2Lxc/\npRy1qV5fYwKBgBWSL/hYVf+RhIuTg/s9/BlCr9SJ0g3nGGRrRVTlWQqjRCpXeFOO\nJzYqSq9pFGKUggEQxoOyJEFPwVDo9gXqRcyov+Xn2kaXl7qQr3yoixc1YZALFDWY\nd1ySBEqQr0xXnV9U/gvEgwotPRnjSzNlLWV2ZuHPtPtG/7M0o1H5GZMBAoGAKr3N\nW0gX53o+my4pCnxRQW+aOIsWq1a5aqRIEFudFGBOUkS2Oz+fI1P1GdrRfhnnfzpz\n2DK+plp/vIkFOpGhrf4bBlJ2psjqa7fdANRFLMaAAfyXLDvScHTQTCcnVUAHQPVq\n2BlSH56pnugyj7SNuLV6pnql+wdhAmRN2m9o1h8CgYAbX2juSr4ioXwnYjOUdrIY\n4+ERvHcXdjoJmmPcAm4y5NbSqLXyU0FQmplNMt2A5LlniWVJ9KNdjAQUt60FZw/+\nr76LdxXaHNZghyx0BOs7mtq5unSQXamZ8KixasfhE9uz3ij1jXjG6hafWkS8/68I\nuWbaZqgvy7a9oPHYlKH7Jg==\n-----END PRIVATE KEY-----\n";
+static TEST_PRIVATE_KEY:&str ="-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCj86SrJIuxSxR6\nBJ/dlJEUIj6NeBRnhLQlCDdovuz61+7kJXVcxaR66w4m8W7SLEUP+IlPtnn6vmiG\n7XMhGNHIr7r1JsEVVLhZmL3tKI66DEZl786ZhG81BWqUlmcooIPS8UEPZNqJXLuz\nVGhxNyVGbj/tV7QC2pSISnKaixc+nrhxvo7w56p5qrm9tik0PjTgfZsUePkoBsSN\npoRkAauS14MAzK6HGB75CzG3dZqXUNWSWVocoWtQbZUwFGXyzU01ammsHQDvc2xu\nK1RQpd1qYH5bOWZ0N0aPFwT0r59HztFXg9sbjsnuhO1A7OiUOkc6iGVuJ0wm/9nA\nwZIBqzgjAgMBAAECggEAPMpeSEbotPhNw2BrllE76ec4omPfzPJbiU+em+wPGoNu\nRJHPDnMKJbl6Kd5jZPKdOOrCnxfd6qcnQsBQa/kz7+GYxMV12l7ra+1Cnujm4v0i\nLTHZvPpp8ZLsjeOmpF3AAzsJEJgon74OqtOlVjVIUPEYKvzV9ijt4gsYq0zfdYv0\nhrTMzyrGM4/UvKLsFIBROAfCeWfA7sXLGH8JhrRAyDrtCPzGtyyAmzoHKHtHafcB\nuyPFw/IP8otAgpDk5iiQPNkH0WwzAQIm12oHuNUa66NwUK4WEjXTnDg8KeWLHHNv\nIfN8vdbZchMUpMIvvkr7is315d8f2cHCB5gEO+GWAQKBgQDR/0xNll+FYaiUKCPZ\nvkOCAd3l5mRhsqnjPQ/6Ul1lAyYWpoJSFMrGGn/WKTa/FVFJRTGbBjwP+Mx10bfb\ngUg2GILDTISUh54fp4zngvTi9w4MWGKXrb7I1jPkM3vbJfC/v2fraQ/r7qHPpO2L\nf6ZbGxasIlSvr37KeGoelwcAQQKBgQDH3hmOTS2Hl6D4EXdq5meHKrfeoicGN7m8\noQK7u8iwn1R9zK5nh6IXxBhKYNXNwdCQtBZVRvFjjZ56SZJb7lKqa1BcTsgJfZCy\nnI3Uu4UykrECAH8AVCVqBXUDJmeA2yE+gDAtYEjvhSDHpUfWxoGHr0B/Oqk2Lxc/\npRy1qV5fYwKBgBWSL/hYVf+RhIuTg/s9/BlCr9SJ0g3nGGRrRVTlWQqjRCpXeFOO\nJzYqSq9pFGKUggEQxoOyJEFPwVDo9gXqRcyov+Xn2kaXl7qQr3yoixc1YZALFDWY\nd1ySBEqQr0xXnV9U/gvEgwotPRnjSzNlLWV2ZuHPtPtG/7M0o1H5GZMBAoGAKr3N\nW0gX53o+my4pCnxRQW+aOIsWq1a5aqRIEFudFGBOUkS2Oz+fI1P1GdrRfhnnfzpz\n2DK+plp/vIkFOpGhrf4bBlJ2psjqa7fdANRFLMaAAfyXLDvScHTQTCcnVUAHQPVq\n2BlSH56pnugyj7SNuLV6pnql+wdhAmRN2m9o1h8CgYAbX2juSr4ioXwnYjOUdrIY\n4+ERvHcXdjoJmmPcAm4y5NbSqLXyU0FQmplNMt2A5LlniWVJ9KNdjAQUt60FZw/+\nr76LdxXaHNZghyx0BOs7mtq5unSQXamZ8KixasfhE9uz3ij1jXjG6hafWkS8/68I\nuWbaZqgvy7a9oPHYlKH7Jg==\n-----END PRIVATE KEY-----\n";
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use rsa::{
-        RsaPrivateKey,
         pkcs8::{EncodePrivateKey, EncodePublicKey, LineEnding},
+        RsaPrivateKey,
     };
     use std::time::{SystemTime, UNIX_EPOCH};
     #[test]
     fn test_gencode_and_parse() {
-        let mut rng = OsRng;
+        let mut rng = rand::thread_rng();
         let bits = 2048;
         let private_key = RsaPrivateKey::new(&mut rng, bits).expect("Failed to generate private key");
         let public_key = RsaPublicKey::from(&private_key);
@@ -101,7 +84,7 @@ mod tests {
 
     #[test]
     fn test_parse_invalid_token() {
-        let private_key_pem = RsaPrivateKey::new(&mut OsRng, 2048)
+        let private_key_pem = RsaPrivateKey::new(&mut rand::thread_rng(), 2048)
             .expect("Failed to generate private key")
             .to_pkcs8_pem(LineEnding::LF)
             .unwrap();

bucket_replicate_test.md

@@ -0,0 +1,45 @@
+启动两个rustfs
+rustfs --address 0.0.0.0:9000 /rustfs-data9000
+rustfs --address 0.0.0.0:9001 /rustfs-data9001
+
+
+### 使用 minio mc 设置 alias 分别为 rustfs 和 rustfs2
+
+
+### 创建 bucket
+mc mb rustfs/srcbucket
+
+### 创建 desc bucket
+
+mc mb rustfs2/destbucket
+
+
+
+### 开启版本控制
+
+mc version enable rustfs/srcbucket
+mc version enable rustfs2/destbucket
+
+#### 使用修改过的 mc 才能 add bucket replication
+
+./mc replication add rustfs/srcbucket --remote-bucket rustfs2/destbucket
+
+
+
+###### 复制一个小文件；
+mc cp ./1.txt rustfs/srcbucket
+
+###### 查看是否成功
+mc ls --versions rustfs/srcbucket/1.txt
+mc ls --versions rustfs/destbucket/1.txt
+
+
+##### 复制一个大文件
+1 创建一个大文件
+dd if=/dev/zero of=./dd.out bs=4096000 count=1000
+
+mc cp ./dd.out rustfs/srcbucket/
+
+##### 查看是否成功
+mc ls --versions rustfs/srcbucket/dd.out
+mc ls --versions rustfs2/destbucket/dd.out

build_rustfs.sh

@@ -1,24 +1,10 @@
 #!/bin/bash
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 clear
 
-# Get the current platform architecture
+# 获取当前平台架构
 ARCH=$(uname -m)
 
-# Set the target directory according to the schema
+# 根据架构设置 target 目录
 if [ "$ARCH" == "x86_64" ]; then
     TARGET_DIR="target/x86_64"
 elif [ "$ARCH" == "aarch64" ]; then
@@ -27,8 +13,8 @@ else
     TARGET_DIR="target/unknown"
 fi
 
-# Set CARGO_TARGET_DIR and build the project
+# 设置 CARGO_TARGET_DIR 并构建项目
-CARGO_TARGET_DIR=$TARGET_DIR RUSTFLAGS="-C link-arg=-fuse-ld=mold" cargo build --release --package rustfs
+CARGO_TARGET_DIR=$TARGET_DIR RUSTFLAGS="-C link-arg=-fuse-ld=mold" cargo build --package rustfs
 
 echo -e "\a"
 echo -e "\a"

cli/rustfs-gui/Cargo.toml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 [package]
 name = "rustfs-gui"
 edition.workspace = true
@@ -29,7 +15,6 @@ keyring = { workspace = true }
 lazy_static = { workspace = true }
 rfd = { workspace = true }
 rust-embed = { workspace = true, features = ["interpolate-folder-path"] }
-rust-i18n = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 sha2 = { workspace = true }

cli/rustfs-gui/assets/js/sts.js

@@ -1,19 +1,3 @@
-/**
- * Copyright 2024 RustFS Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 window.switchTab = function (tabId) {
     // Hide everything
     document.querySelectorAll('.tab-content').forEach(content => {

cli/rustfs-gui/assets/styling/navbar.css

@@ -1,19 +1,3 @@
-/**
- * Copyright 2024 RustFS Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 #navbar {
     display: flex;
     flex-direction: row;

cli/rustfs-gui/assets/tailwind.css

@@ -1,19 +1,3 @@
-/**
- * Copyright 2024 RustFS Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 *, ::before, ::after {
   --tw-border-spacing-x: 0;
   --tw-border-spacing-y: 0;

cli/rustfs-gui/input.css

@@ -1,19 +1,3 @@
-/**
- * Copyright 2024 RustFS Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 @tailwind base;
 @tailwind components;
 @tailwind utilities;

cli/rustfs-gui/src/components/home.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use crate::components::navbar::LoadingSpinner;
 use crate::route::Route;
 use crate::utils::{RustFSConfig, ServiceManager};
@@ -44,11 +30,11 @@ pub fn Home() -> Element {
     #[allow(clippy::redundant_closure)]
     let service = use_signal(|| ServiceManager::new());
     let conf = RustFSConfig::load().unwrap_or_else(|e| {
-        ServiceManager::show_error(&format!("load config failed: {e}"));
+        ServiceManager::show_error(&format!("加载配置失败：{}", e));
         RustFSConfig::default()
     });
 
-    debug!("loaded configurations: {:?}", conf);
+    debug!("loaded configurations:{:?}", conf);
     let config = use_signal(|| conf.clone());
 
     use dioxus_router::prelude::Link;
@@ -92,7 +78,7 @@ pub fn Home() -> Element {
                     }
                 }
                 Err(e) => {
-                    ServiceManager::show_error(&format!("start service failed: {e}"));
+                    ServiceManager::show_error(&format!("服务启动失败：{}", e));
                 }
             }
             // Only set loading to false when it's actually done
@@ -118,7 +104,7 @@ pub fn Home() -> Element {
                     }
                 }
                 Err(e) => {
-                    ServiceManager::show_error(&format!("stop service failed: {e}"));
+                    ServiceManager::show_error(&format!("服务停止失败：{}", e));
                 }
             }
             debug!("service_state: {:?}", service_state.read());
@@ -157,7 +143,6 @@ pub fn Home() -> Element {
         Title { "RustFS APP" }
         Meta {
             name: "description",
-            // TODO: translate to english
             content: "RustFS RustFS 用热门安全的 Rust 语言开发，兼容 S3 协议。适用于 AI/ML 及海量数据存储、大数据、互联网、工业和保密存储等全部场景。近乎免费使用。遵循 Apache 2 协议，支持国产保密设备和系统。",
         }
         div { class: "min-h-screen flex flex-col items-center bg-white",
@@ -181,7 +166,7 @@ pub fn Home() -> Element {
                 }
                 LoadingSpinner {
                     loading: loading.read().to_owned(),
-                    text: "processing...",
+                    text: "服务处理中...",
                 }
                 button { class: button_class, onclick: toggle_service,
                     svg {

cli/rustfs-gui/src/components/mod.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 mod home;
 pub use home::Home;
 mod navbar;

cli/rustfs-gui/src/components/navbar.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use crate::route::Route;
 use dioxus::logger::tracing::debug;
 use dioxus::prelude::*;

cli/rustfs-gui/src/components/setting.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use crate::components::navbar::LoadingSpinner;
 use dioxus::logger::tracing::{debug, error};
 use dioxus::prelude::*;
@@ -63,7 +49,7 @@ pub fn Setting() -> Element {
             let config = config.read().clone();
             spawn(async move {
                 if let Err(e) = service.read().restart(config).await {
-                    ServiceManager::show_error(&format!("发送重启命令失败：{e}"));
+                    ServiceManager::show_error(&format!("发送重启命令失败：{}", e));
                 }
                 // reset the status when you're done
                 loading.set(false);

cli/rustfs-gui/src/main.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 mod components;
 mod route;
 mod utils;

cli/rustfs-gui/src/route/mod.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 mod router;
 
 pub use router::Route;

cli/rustfs-gui/src/route/router.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use crate::components::Navbar;
 use crate::views::{HomeViews, SettingViews};
 use dioxus::prelude::*;

cli/rustfs-gui/src/utils/config.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use keyring::Entry;
 use serde::{Deserialize, Serialize};
 use std::error::Error;
@@ -215,7 +201,7 @@ impl RustFSConfig {
     /// Clear the stored configuration from the system keyring
     ///
     /// # Returns
-    /// `Ok(())` if the configuration was successfully cleared, or an error if the operation failed.
+    /// Returns `Ok(())` if the configuration was successfully cleared, or an error if the operation failed.
     ///
     /// # Example
     /// ```
@@ -302,7 +288,7 @@ mod tests {
 
         for (input, expected) in test_cases {
             let result = RustFSConfig::extract_host_port(input);
-            assert_eq!(result, expected, "Failed for input: {input}");
+            assert_eq!(result, expected, "Failed for input: {}", input);
         }
     }
 
@@ -320,7 +306,7 @@ mod tests {
 
         for input in invalid_cases {
             let result = RustFSConfig::extract_host_port(input);
-            assert_eq!(result, None, "Should be None for input: {input}");
+            assert_eq!(result, None, "Should be None for input: {}", input);
         }
 
         // Special case: empty host but valid port should still work
@@ -451,7 +437,7 @@ mod tests {
     #[test]
     fn test_debug_format() {
         let config = RustFSConfig::default_config();
-        let debug_str = format!("{config:?}");
+        let debug_str = format!("{:?}", config);
 
         assert!(debug_str.contains("RustFSConfig"));
         assert!(debug_str.contains("address"));
@@ -498,14 +484,14 @@ mod tests {
     fn test_very_long_strings() {
         let long_string = "a".repeat(1000);
         let config = RustFSConfig {
-            address: format!("{long_string}:9000"),
+            address: format!("{}:9000", long_string),
             host: long_string.clone(),
             port: "9000".to_string(),
             access_key: long_string.clone(),
             secret_key: long_string.clone(),
-            domain_name: format!("{long_string}.com"),
+            domain_name: format!("{}.com", long_string),
-            volume_name: format!("/data/{long_string}"),
+            volume_name: format!("/data/{}", long_string),
-            console_address: format!("{long_string}:9001"),
+            console_address: format!("{}:9001", long_string),
         };
 
         assert_eq!(config.host.len(), 1000);
@@ -539,14 +525,14 @@ mod tests {
             host: "127.0.0.1".to_string(),
             port: "9000".to_string(),
             access_key: "用户名".to_string(),
-            secret_key: "密码 123".to_string(),
+            secret_key: "密码123".to_string(),
             domain_name: "测试.com".to_string(),
             volume_name: "/数据/存储".to_string(),
             console_address: "127.0.0.1:9001".to_string(),
         };
 
         assert_eq!(config.access_key, "用户名");
-        assert_eq!(config.secret_key, "密码 123");
+        assert_eq!(config.secret_key, "密码123");
         assert_eq!(config.domain_name, "测试.com");
         assert_eq!(config.volume_name, "/数据/存储");
     }

cli/rustfs-gui/src/utils/helper.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use crate::utils::RustFSConfig;
 use dioxus::logger::tracing::{debug, error, info};
 use lazy_static::lazy_static;
@@ -25,7 +11,7 @@ use tokio::fs;
 use tokio::fs::File;
 use tokio::io::AsyncWriteExt;
 use tokio::net::TcpStream;
-use tokio::sync::{Mutex, mpsc};
+use tokio::sync::{mpsc, Mutex};
 
 #[derive(RustEmbed)]
 #[folder = "$CARGO_MANIFEST_DIR/embedded-rustfs/"]
@@ -198,7 +184,7 @@ impl ServiceManager {
             let cached_hash = fs::read_to_string(&hash_path).await?;
             let expected_hash = RUSTFS_HASH.lock().await;
             if cached_hash == *expected_hash {
-                println!("Use cached rustfs: {executable_path:?}");
+                println!("Use cached rustfs: {:?}", executable_path);
                 return Ok(executable_path);
             }
         }
@@ -249,23 +235,23 @@ impl ServiceManager {
                 match cmd {
                     ServiceCommand::Start(config) => {
                         if let Err(e) = Self::start_service(&config).await {
-                            Self::show_error(&format!("启动服务失败：{e}"));
+                            Self::show_error(&format!("启动服务失败：{}", e));
                         }
                     }
                     ServiceCommand::Stop => {
                         if let Err(e) = Self::stop_service().await {
-                            Self::show_error(&format!("停止服务失败：{e}"));
+                            Self::show_error(&format!("停止服务失败：{}", e));
                         }
                     }
                     ServiceCommand::Restart(config) => {
                         if Self::check_service_status().await.is_some() {
                             if let Err(e) = Self::stop_service().await {
-                                Self::show_error(&format!("重启服务失败：{e}"));
+                                Self::show_error(&format!("重启服务失败：{}", e));
                                 continue;
                             }
                         }
                         if let Err(e) = Self::start_service(&config).await {
-                            Self::show_error(&format!("重启服务失败：{e}"));
+                            Self::show_error(&format!("重启服务失败：{}", e));
                         }
                     }
                 }
@@ -297,7 +283,7 @@ impl ServiceManager {
     async fn start_service(config: &RustFSConfig) -> Result<(), Box<dyn Error>> {
         // Check if the service is already running
         if let Some(existing_pid) = Self::check_service_status().await {
-            return Err(format!("服务已经在运行，PID: {existing_pid}").into());
+            return Err(format!("服务已经在运行，PID: {}", existing_pid).into());
         }
 
         // Prepare the service program
@@ -318,7 +304,7 @@ impl ServiceManager {
         let ports = vec![main_port, console_port];
         for port in ports {
             if Self::is_port_in_use(host, port).await {
-                return Err(format!("端口 {port} 已被占用").into());
+                return Err(format!("端口 {} 已被占用", port).into());
             }
         }
 
@@ -341,7 +327,7 @@ impl ServiceManager {
 
         // Check if the service started successfully
         if Self::is_port_in_use(host, main_port).await {
-            Self::show_info(&format!("服务启动成功！进程 ID: {process_pid}"));
+            Self::show_info(&format!("服务启动成功！进程 ID: {}", process_pid));
 
             Ok(())
         } else {
@@ -401,7 +387,7 @@ impl ServiceManager {
     /// println!("{:?}", result);
     /// ```
     async fn is_port_in_use(host: &str, port: u16) -> bool {
-        TcpStream::connect(format!("{host}:{port}")).await.is_ok()
+        TcpStream::connect(format!("{}:{}", host, port)).await.is_ok()
     }
 
     /// Show an error message
@@ -688,7 +674,7 @@ mod tests {
             message: "Test message".to_string(),
         };
 
-        let debug_str = format!("{result:?}");
+        let debug_str = format!("{:?}", result);
         assert!(debug_str.contains("ServiceOperationResult"));
         assert!(debug_str.contains("success: true"));
         assert!(debug_str.contains("Test message"));
@@ -705,8 +691,8 @@ mod tests {
             let cloned_manager = service_manager.clone();
 
             // Both should be valid (we can't test much more without async runtime)
-            assert!(format!("{service_manager:?}").contains("ServiceManager"));
+            assert!(format!("{:?}", service_manager).contains("ServiceManager"));
-            assert!(format!("{cloned_manager:?}").contains("ServiceManager"));
+            assert!(format!("{:?}", cloned_manager).contains("ServiceManager"));
         });
     }
 
@@ -724,7 +710,7 @@ mod tests {
 
         for (input, expected) in test_cases {
             let result = ServiceManager::extract_port(input);
-            assert_eq!(result, expected, "Failed for input: {input}");
+            assert_eq!(result, expected, "Failed for input: {}", input);
         }
     }
 
@@ -743,7 +729,7 @@ mod tests {
 
         for input in invalid_cases {
             let result = ServiceManager::extract_port(input);
-            assert_eq!(result, None, "Should be None for input: {input}");
+            assert_eq!(result, None, "Should be None for input: {}", input);
         }
 
         // Special case: empty host but valid port should still work
@@ -760,10 +746,10 @@ mod tests {
         assert_eq!(ServiceManager::extract_port("host:0"), Some(0));
         assert_eq!(ServiceManager::extract_port("host:65535"), Some(65535));
         assert_eq!(ServiceManager::extract_port("host:65536"), None); // Out of range
-        // IPv6-like address - extract_port takes the second part after split(':')
+                                                                      // IPv6-like address - extract_port takes the second part after split(':')
-        // For "::1:8080", split(':') gives ["", "", "1", "8080"], nth(1) gives ""
+                                                                      // For "::1:8080", split(':') gives ["", "", "1", "8080"], nth(1) gives ""
         assert_eq!(ServiceManager::extract_port("::1:8080"), None); // Second part is empty
-        // For "[::1]:8080", split(':') gives ["[", "", "1]", "8080"], nth(1) gives ""
+                                                                    // For "[::1]:8080", split(':') gives ["[", "", "1]", "8080"], nth(1) gives ""
         assert_eq!(ServiceManager::extract_port("[::1]:8080"), None); // Second part is empty
     }
 

cli/rustfs-gui/src/utils/logger.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use dioxus::logger::tracing::debug;
 use tracing_appender::non_blocking::WorkerGuard;
 use tracing_appender::rolling::{RollingFileAppender, Rotation};
@@ -108,7 +94,7 @@ mod tests {
 
         // We can't actually build it without creating directories,
         // but we can verify the builder pattern works
-        let debug_str = format!("{builder:?}");
+        let debug_str = format!("{:?}", builder);
         // The actual debug format might be different, so just check it's not empty
         assert!(!debug_str.is_empty());
         // Check that it contains some expected parts
@@ -126,10 +112,10 @@ mod tests {
         let never = Rotation::NEVER;
 
         // Test that rotation types can be created and formatted
-        assert!(!format!("{daily:?}").is_empty());
+        assert!(!format!("{:?}", daily).is_empty());
-        assert!(!format!("{hourly:?}").is_empty());
+        assert!(!format!("{:?}", hourly).is_empty());
-        assert!(!format!("{minutely:?}").is_empty());
+        assert!(!format!("{:?}", minutely).is_empty());
-        assert!(!format!("{never:?}").is_empty());
+        assert!(!format!("{:?}", never).is_empty());
     }
 
     #[test]
@@ -173,10 +159,10 @@ mod tests {
         let error_filter = tracing_subscriber::EnvFilter::new("error");
 
         // Test that filters can be created
-        assert!(!format!("{info_filter:?}").is_empty());
+        assert!(!format!("{:?}", info_filter).is_empty());
-        assert!(!format!("{debug_filter:?}").is_empty());
+        assert!(!format!("{:?}", debug_filter).is_empty());
-        assert!(!format!("{warn_filter:?}").is_empty());
+        assert!(!format!("{:?}", warn_filter).is_empty());
-        assert!(!format!("{error_filter:?}").is_empty());
+        assert!(!format!("{:?}", error_filter).is_empty());
     }
 
     #[test]
@@ -215,7 +201,7 @@ mod tests {
         assert_eq!(suffix, "log");
 
         // Test that these would create valid filenames
-        let sample_filename = format!("{prefix}.2024-01-01.{suffix}");
+        let sample_filename = format!("{}.2024-01-01.{}", prefix, suffix);
         assert_eq!(sample_filename, "rustfs-cli.2024-01-01.log");
     }
 
@@ -257,7 +243,7 @@ mod tests {
         assert_eq!(logs_dir_name, "logs");
 
         // Test path joining
-        let combined = format!("{rustfs_dir_name}/{logs_dir_name}");
+        let combined = format!("{}/{}", rustfs_dir_name, logs_dir_name);
         assert_eq!(combined, "rustfs/logs");
     }
 

cli/rustfs-gui/src/utils/mod.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 mod config;
 mod helper;
 mod logger;

cli/rustfs-gui/src/views/app.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use crate::route::Route;
 use dioxus::logger::tracing::info;
 use dioxus::prelude::*;

cli/rustfs-gui/src/views/home.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use crate::components::Home;
 use dioxus::prelude::*;
 

cli/rustfs-gui/src/views/mod.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 mod app;
 mod home;
 mod setting;

cli/rustfs-gui/src/views/setting.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use crate::components::Setting;
 use dioxus::prelude::*;
 

cli/rustfs-gui/tailwind.config.js

@@ -1,19 +1,3 @@
-/**
- * Copyright 2024 RustFS Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 module.exports = {
     mode: "all",
     content: ["./src/**/*.{rs,html,css}", "./dist/**/*.html"],

common/common/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "common"
+version.workspace = true
+edition.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+async-trait.workspace = true
+lazy_static.workspace = true
+scopeguard = "1.2.0"
+tokio.workspace = true
+tonic = { workspace = true }
+tracing-error.workspace = true

common/common/src/bucket_stats.rs

@@ -1,33 +1,19 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use std::collections::HashMap;
 
 use crate::last_minute::{self};
 pub struct ReplicationLatency {
-    // Delays for single and multipart PUT requests
+    // 单个和多部分 PUT 请求的延迟
     upload_histogram: last_minute::LastMinuteHistogram,
 }
 
 impl ReplicationLatency {
-    // Merge two ReplicationLatency
+    // 合并两个 ReplicationLatency
     pub fn merge(&mut self, other: &mut ReplicationLatency) -> &ReplicationLatency {
         self.upload_histogram.merge(&other.upload_histogram);
         self
     }
 
-    // Get upload delay (categorized by object size interval)
+    // 获取上传延迟（按对象大小区间分类）
     pub fn get_upload_latency(&mut self) -> HashMap<String, u64> {
         let mut ret = HashMap::new();
         let avg = self.upload_histogram.get_avg_data();
@@ -41,7 +27,7 @@ impl ReplicationLatency {
         self.upload_histogram.add(size, during);
     }
 
-    // Simulate the conversion from size tag to string
+    // 模拟从 size tag 到字符串的转换
     fn size_tag_to_string(&self, tag: usize) -> String {
         match tag {
             0 => String::from("Size < 1 KiB"),

common/common/src/error.rs

@@ -0,0 +1,339 @@
+use tracing_error::{SpanTrace, SpanTraceStatus};
+
+pub type StdError = Box<dyn std::error::Error + Send + Sync + 'static>;
+
+pub type Result<T = (), E = Error> = std::result::Result<T, E>;
+
+#[derive(Debug)]
+pub struct Error {
+    inner: Box<dyn std::error::Error + Send + Sync + 'static>,
+    span_trace: SpanTrace,
+}
+
+impl Error {
+    /// Create a new error from a `std::error::Error`.
+    #[must_use]
+    #[track_caller]
+    pub fn new<T: std::error::Error + Send + Sync + 'static>(source: T) -> Self {
+        Self::from_std_error(source.into())
+    }
+
+    /// Create a new error from a `std::error::Error`.
+    #[must_use]
+    #[track_caller]
+    pub fn from_std_error(inner: StdError) -> Self {
+        Self {
+            inner,
+            span_trace: SpanTrace::capture(),
+        }
+    }
+
+    /// Create a new error from a string.
+    #[must_use]
+    #[track_caller]
+    pub fn from_string(s: impl Into<String>) -> Self {
+        Self::msg(s)
+    }
+
+    /// Create a new error from a string.
+    #[must_use]
+    #[track_caller]
+    pub fn msg(s: impl Into<String>) -> Self {
+        Self::from_std_error(s.into().into())
+    }
+
+    /// Returns `true` if the inner type is the same as `T`.
+    #[inline]
+    pub fn is<T: std::error::Error + 'static>(&self) -> bool {
+        self.inner.is::<T>()
+    }
+
+    /// Returns some reference to the inner value if it is of type `T`, or
+    /// `None` if it isn't.
+    #[inline]
+    pub fn downcast_ref<T: std::error::Error + 'static>(&self) -> Option<&T> {
+        self.inner.downcast_ref()
+    }
+
+    /// Returns some mutable reference to the inner value if it is of type `T`, or
+    /// `None` if it isn't.
+    #[inline]
+    pub fn downcast_mut<T: std::error::Error + 'static>(&mut self) -> Option<&mut T> {
+        self.inner.downcast_mut()
+    }
+
+    pub fn to_io_err(&self) -> Option<std::io::Error> {
+        self.downcast_ref::<std::io::Error>()
+            .map(|e| std::io::Error::new(e.kind(), e.to_string()))
+    }
+
+    pub fn inner_string(&self) -> String {
+        self.inner.to_string()
+    }
+}
+
+impl<T: std::error::Error + Send + Sync + 'static> From<T> for Error {
+    fn from(e: T) -> Self {
+        Self::new(e)
+    }
+}
+
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.inner)?;
+
+        if self.span_trace.status() != SpanTraceStatus::EMPTY {
+            write!(f, "\nspan_trace:\n{}", self.span_trace)?;
+        }
+
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::io;
+
+    #[derive(Debug)]
+    struct CustomTestError {
+        message: String,
+    }
+
+    impl std::fmt::Display for CustomTestError {
+        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+            write!(f, "Custom test error: {}", self.message)
+        }
+    }
+
+    impl std::error::Error for CustomTestError {}
+
+    #[derive(Debug)]
+    struct AnotherTestError;
+
+    impl std::fmt::Display for AnotherTestError {
+        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+            write!(f, "Another test error")
+        }
+    }
+
+    impl std::error::Error for AnotherTestError {}
+
+    #[test]
+    fn test_error_new_from_std_error() {
+        let io_error = io::Error::new(io::ErrorKind::NotFound, "File not found");
+        let error = Error::new(io_error);
+
+        assert!(error.inner_string().contains("File not found"));
+        assert!(error.is::<io::Error>());
+    }
+
+    #[test]
+    fn test_error_from_std_error() {
+        let io_error = io::Error::new(io::ErrorKind::PermissionDenied, "Permission denied");
+        let boxed_error: StdError = Box::new(io_error);
+        let error = Error::from_std_error(boxed_error);
+
+        assert!(error.inner_string().contains("Permission denied"));
+        assert!(error.is::<io::Error>());
+    }
+
+    #[test]
+    fn test_error_from_string() {
+        let error = Error::from_string("Test error message");
+        assert_eq!(error.inner_string(), "Test error message");
+    }
+
+    #[test]
+    fn test_error_msg() {
+        let error = Error::msg("Another test message");
+        assert_eq!(error.inner_string(), "Another test message");
+    }
+
+    #[test]
+    fn test_error_msg_with_string() {
+        let message = String::from("String message");
+        let error = Error::msg(message);
+        assert_eq!(error.inner_string(), "String message");
+    }
+
+    #[test]
+    fn test_error_is_type_checking() {
+        let io_error = io::Error::new(io::ErrorKind::InvalidInput, "Invalid input");
+        let error = Error::new(io_error);
+
+        assert!(error.is::<io::Error>());
+        assert!(!error.is::<CustomTestError>());
+    }
+
+    #[test]
+    fn test_error_downcast_ref() {
+        let io_error = io::Error::new(io::ErrorKind::TimedOut, "Operation timed out");
+        let error = Error::new(io_error);
+
+        let downcast_io = error.downcast_ref::<io::Error>();
+        assert!(downcast_io.is_some());
+        assert_eq!(downcast_io.unwrap().kind(), io::ErrorKind::TimedOut);
+
+        let downcast_custom = error.downcast_ref::<CustomTestError>();
+        assert!(downcast_custom.is_none());
+    }
+
+    #[test]
+    fn test_error_downcast_mut() {
+        let io_error = io::Error::new(io::ErrorKind::Interrupted, "Operation interrupted");
+        let mut error = Error::new(io_error);
+
+        let downcast_io = error.downcast_mut::<io::Error>();
+        assert!(downcast_io.is_some());
+        assert_eq!(downcast_io.unwrap().kind(), io::ErrorKind::Interrupted);
+
+        let downcast_custom = error.downcast_mut::<CustomTestError>();
+        assert!(downcast_custom.is_none());
+    }
+
+    #[test]
+    fn test_error_to_io_err() {
+        // Test with IO error
+        let original_io_error = io::Error::new(io::ErrorKind::BrokenPipe, "Broken pipe");
+        let error = Error::new(original_io_error);
+
+        let converted_io_error = error.to_io_err();
+        assert!(converted_io_error.is_some());
+        let io_err = converted_io_error.unwrap();
+        assert_eq!(io_err.kind(), io::ErrorKind::BrokenPipe);
+        assert!(io_err.to_string().contains("Broken pipe"));
+
+        // Test with non-IO error
+        let custom_error = CustomTestError {
+            message: "Not an IO error".to_string(),
+        };
+        let error = Error::new(custom_error);
+
+        let converted_io_error = error.to_io_err();
+        assert!(converted_io_error.is_none());
+    }
+
+    #[test]
+    fn test_error_inner_string() {
+        let custom_error = CustomTestError {
+            message: "Test message".to_string(),
+        };
+        let error = Error::new(custom_error);
+
+        assert_eq!(error.inner_string(), "Custom test error: Test message");
+    }
+
+    #[test]
+    fn test_error_from_trait() {
+        let io_error = io::Error::new(io::ErrorKind::UnexpectedEof, "Unexpected EOF");
+        let error: Error = io_error.into();
+
+        assert!(error.is::<io::Error>());
+        assert!(error.inner_string().contains("Unexpected EOF"));
+    }
+
+    #[test]
+    fn test_error_display() {
+        let custom_error = CustomTestError {
+            message: "Display test".to_string(),
+        };
+        let error = Error::new(custom_error);
+
+        let display_string = format!("{}", error);
+        assert!(display_string.contains("Custom test error: Display test"));
+    }
+
+    #[test]
+    fn test_error_debug() {
+        let error = Error::msg("Debug test");
+        let debug_string = format!("{:?}", error);
+
+        assert!(debug_string.contains("Error"));
+        assert!(debug_string.contains("inner"));
+        assert!(debug_string.contains("span_trace"));
+    }
+
+    #[test]
+    fn test_multiple_error_types() {
+        let errors = vec![
+            Error::new(io::Error::new(io::ErrorKind::NotFound, "Not found")),
+            Error::new(CustomTestError {
+                message: "Custom".to_string(),
+            }),
+            Error::new(AnotherTestError),
+            Error::msg("String error"),
+        ];
+
+        assert!(errors[0].is::<io::Error>());
+        assert!(errors[1].is::<CustomTestError>());
+        assert!(errors[2].is::<AnotherTestError>());
+        assert!(!errors[3].is::<io::Error>());
+    }
+
+    #[test]
+    fn test_error_chain_compatibility() {
+        // Test that our Error type works well with error chains
+        let io_error = io::Error::new(io::ErrorKind::InvalidData, "Invalid data");
+        let error = Error::new(io_error);
+
+        // Should be able to convert back to Result
+        let result: Result<(), Error> = Err(error);
+        assert!(result.is_err());
+
+        // Test the error from the result
+        if let Err(err) = result {
+            assert!(err.is::<io::Error>());
+        }
+    }
+
+    #[test]
+    fn test_result_type_alias() {
+        // Test the Result type alias
+        fn test_function() -> Result<String> {
+            Ok("Success".to_string())
+        }
+
+        fn test_function_with_error() -> Result<String> {
+            Err(Error::msg("Test error"))
+        }
+
+        let success_result = test_function();
+        assert!(success_result.is_ok());
+        assert_eq!(success_result.unwrap(), "Success");
+
+        let error_result = test_function_with_error();
+        assert!(error_result.is_err());
+        assert_eq!(error_result.unwrap_err().inner_string(), "Test error");
+    }
+
+    #[test]
+    fn test_error_with_empty_message() {
+        let error = Error::msg("");
+        assert_eq!(error.inner_string(), "");
+    }
+
+    #[test]
+    fn test_error_with_unicode_message() {
+        let unicode_message = "错误信息 🚨 Error message with émojis and ñon-ASCII";
+        let error = Error::msg(unicode_message);
+        assert_eq!(error.inner_string(), unicode_message);
+    }
+
+    #[test]
+    fn test_error_with_very_long_message() {
+        let long_message = "A".repeat(10000);
+        let error = Error::msg(&long_message);
+        assert_eq!(error.inner_string(), long_message);
+    }
+
+    #[test]
+    fn test_span_trace_capture() {
+        // Test that span trace is captured (though we can't easily test the content)
+        let error = Error::msg("Span trace test");
+        let display_string = format!("{}", error);
+
+        // The error should at least contain the message
+        assert!(display_string.contains("Span trace test"));
+    }
+}

common/common/src/globals.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use std::collections::HashMap;
 
 use lazy_static::lazy_static;

common/common/src/last_minute.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 #[allow(dead_code)]
@@ -85,7 +71,7 @@ impl std::fmt::Display for SizeCategory {
             SizeCategory::SizeGreaterThan1GiB => "SizeGreaterThan1GiB",
             SizeCategory::SizeLastElemMarker => "SizeLastElemMarker",
         };
-        write!(f, "{s}")
+        write!(f, "{}", s)
     }
 }
 
@@ -653,7 +639,7 @@ mod tests {
         assert_eq!(elem.n, cloned.n);
 
         // Test Debug trait
-        let debug_str = format!("{elem:?}");
+        let debug_str = format!("{:?}", elem);
         assert!(debug_str.contains("100"));
         assert!(debug_str.contains("200"));
         assert!(debug_str.contains("5"));
@@ -769,7 +755,8 @@ mod tests {
 
             assert_eq!(
                 test_latency.totals[expected_idx].n, 1,
-                "Failed for timestamp {timestamp} (expected index {expected_idx})"
+                "Failed for timestamp {} (expected index {})",
+                timestamp, expected_idx
             );
         }
     }
@@ -809,7 +796,7 @@ mod tests {
             n: 789,
         };
 
-        let debug_str = format!("{elem:?}");
+        let debug_str = format!("{:?}", elem);
         assert!(debug_str.contains("123"));
         assert!(debug_str.contains("456"));
         assert!(debug_str.contains("789"));

common/common/src/lib.rs

@@ -0,0 +1,27 @@
+pub mod bucket_stats;
+pub mod error;
+pub mod globals;
+pub mod last_minute;
+
+// is ','
+pub static DEFAULT_DELIMITER: u8 = 44;
+
+/// Defers evaluation of a block of code until the end of the scope.
+#[macro_export]
+macro_rules! defer {
+    ($($body:tt)*) => {
+        let _guard = {
+            pub struct Guard<F: FnOnce()>(Option<F>);
+
+            impl<F: FnOnce()> Drop for Guard<F> {
+                fn drop(&mut self) {
+                    (self.0).take().map(|f| f());
+                }
+            }
+
+            Guard(Some(|| {
+                let _ = { $($body)* };
+            }))
+        };
+    };
+}

common/lock/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "lock"
+version.workspace = true
+edition.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+async-trait.workspace = true
+backon.workspace = true
+common.workspace = true
+lazy_static.workspace = true
+protos.workspace = true
+rand.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tokio.workspace = true
+tonic.workspace = true
+tracing.workspace = true
+tracing-error.workspace = true
+url.workspace = true
+uuid.workspace = true

common/lock/src/drwmutex.rs

@@ -1,22 +1,9 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use std::time::{Duration, Instant};
+
 use tokio::{sync::mpsc::Sender, time::sleep};
 use tracing::{info, warn};
 
-use crate::{LockApi, Locker, lock_args::LockArgs};
+use crate::{lock_args::LockArgs, LockApi, Locker};
 
 const DRW_MUTEX_REFRESH_INTERVAL: Duration = Duration::from_secs(10);
 const LOCK_RETRY_MIN_INTERVAL: Duration = Duration::from_millis(250);
@@ -130,10 +117,7 @@ impl DRWMutex {
                 quorum += 1;
             }
         }
-        info!(
+        info!("lockBlocking {}/{} for {:?}: lockType readLock({}), additional opts: {:?}, quorum: {}, tolerance: {}, lockClients: {}\n", id, source, self.names, is_read_lock, opts, quorum, tolerance, locker_len);
-            "lockBlocking {}/{} for {:?}: lockType readLock({}), additional opts: {:?}, quorum: {}, tolerance: {}, lockClients: {}\n",
-            id, source, self.names, is_read_lock, opts, quorum, tolerance, locker_len
-        );
 
         // Recalculate tolerance after potential quorum adjustment
         // Use saturating_sub to prevent underflow
@@ -392,8 +376,8 @@ mod tests {
     use super::*;
     use crate::local_locker::LocalLocker;
     use async_trait::async_trait;
+    use common::error::{Error, Result};
     use std::collections::HashMap;
-    use std::io::{Error, Result};
     use std::sync::{Arc, Mutex};
 
     // Mock locker for testing
@@ -452,10 +436,10 @@ mod tests {
         async fn lock(&mut self, args: &LockArgs) -> Result<bool> {
             let mut state = self.state.lock().unwrap();
             if state.should_fail {
-                return Err(Error::other("Mock lock failure"));
+                return Err(Error::from_string("Mock lock failure"));
             }
             if !state.is_online {
-                return Err(Error::other("Mock locker offline"));
+                return Err(Error::from_string("Mock locker offline"));
             }
 
             // Check if already locked
@@ -470,7 +454,7 @@ mod tests {
         async fn unlock(&mut self, args: &LockArgs) -> Result<bool> {
             let mut state = self.state.lock().unwrap();
             if state.should_fail {
-                return Err(Error::other("Mock unlock failure"));
+                return Err(Error::from_string("Mock unlock failure"));
             }
 
             Ok(state.locks.remove(&args.uid).is_some())
@@ -479,10 +463,10 @@ mod tests {
         async fn rlock(&mut self, args: &LockArgs) -> Result<bool> {
             let mut state = self.state.lock().unwrap();
             if state.should_fail {
-                return Err(Error::other("Mock rlock failure"));
+                return Err(Error::from_string("Mock rlock failure"));
             }
             if !state.is_online {
-                return Err(Error::other("Mock locker offline"));
+                return Err(Error::from_string("Mock locker offline"));
             }
 
             // Check if write lock exists
@@ -497,7 +481,7 @@ mod tests {
         async fn runlock(&mut self, args: &LockArgs) -> Result<bool> {
             let mut state = self.state.lock().unwrap();
             if state.should_fail {
-                return Err(Error::other("Mock runlock failure"));
+                return Err(Error::from_string("Mock runlock failure"));
             }
 
             Ok(state.read_locks.remove(&args.uid).is_some())
@@ -506,7 +490,7 @@ mod tests {
         async fn refresh(&mut self, _args: &LockArgs) -> Result<bool> {
             let state = self.state.lock().unwrap();
             if state.should_fail {
-                return Err(Error::other("Mock refresh failure"));
+                return Err(Error::from_string("Mock refresh failure"));
             }
             Ok(true)
         }
@@ -625,7 +609,7 @@ mod tests {
             timeout: Duration::from_secs(5),
             retry_interval: Duration::from_millis(100),
         };
-        let debug_str = format!("{opts:?}");
+        let debug_str = format!("{:?}", opts);
         assert!(debug_str.contains("timeout"));
         assert!(debug_str.contains("retry_interval"));
     }
@@ -863,7 +847,7 @@ mod tests {
         let lockers = create_mock_lockers(1);
         let mutex = DRWMutex::new("owner1".to_string(), names, lockers);
 
-        let debug_str = format!("{mutex:?}");
+        let debug_str = format!("{:?}", mutex);
         assert!(debug_str.contains("DRWMutex"));
         assert!(debug_str.contains("owner"));
         assert!(debug_str.contains("names"));
@@ -896,8 +880,8 @@ mod tests {
         // Case 1: Even number of lockers
         let locks = vec!["uid1".to_string(), "uid2".to_string(), "uid3".to_string(), "uid4".to_string()];
         let tolerance = 2; // locks.len() / 2 = 4 / 2 = 2
-        // locks.len() - tolerance = 4 - 2 = 2, which equals tolerance
+                           // locks.len() - tolerance = 4 - 2 = 2, which equals tolerance
-        // So the special case applies: un_locks_failed >= tolerance
+                           // So the special case applies: un_locks_failed >= tolerance
 
         // All 4 failed unlocks
         assert!(check_failed_unlocks(&locks, tolerance)); // 4 >= 2 = true
@@ -913,8 +897,8 @@ mod tests {
         // Case 2: Odd number of lockers
         let locks = vec!["uid1".to_string(), "uid2".to_string(), "uid3".to_string()];
         let tolerance = 1; // locks.len() / 2 = 3 / 2 = 1
-        // locks.len() - tolerance = 3 - 1 = 2, which does NOT equal tolerance (1)
+                           // locks.len() - tolerance = 3 - 1 = 2, which does NOT equal tolerance (1)
-        // So the normal case applies: un_locks_failed > tolerance
+                           // So the normal case applies: un_locks_failed > tolerance
 
         // 3 failed unlocks
         assert!(check_failed_unlocks(&locks, tolerance)); // 3 > 1 = true

common/lock/src/lib.rs

@@ -1,25 +1,13 @@
 #![allow(dead_code)]
-// Copyright 2024 RustFS Team
+
-//
+use std::sync::Arc;
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 use async_trait::async_trait;
+use common::error::Result;
 use lazy_static::lazy_static;
 use local_locker::LocalLocker;
 use lock_args::LockArgs;
 use remote_client::RemoteClient;
-use std::io::Result;
-use std::sync::Arc;
 use tokio::sync::RwLock;
 
 pub mod drwmutex;

common/lock/src/local_locker.rs

@@ -1,27 +1,13 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use async_trait::async_trait;
-use std::io::{Error, Result};
+use common::error::{Error, Result};
 use std::{
     collections::HashMap,
     time::{Duration, Instant},
 };
 
-use crate::{Locker, lock_args::LockArgs};
+use crate::{lock_args::LockArgs, Locker};
 
-pub const MAX_DELETE_LIST: usize = 1000;
+const MAX_DELETE_LIST: usize = 1000;
 
 #[derive(Clone, Debug)]
 struct LockRequesterInfo {
@@ -130,8 +116,9 @@ impl LocalLocker {
 impl Locker for LocalLocker {
     async fn lock(&mut self, args: &LockArgs) -> Result<bool> {
         if args.resources.len() > MAX_DELETE_LIST {
-            return Err(Error::other(format!(
+            return Err(Error::from_string(format!(
-                "internal error: LocalLocker.lock called with more than {MAX_DELETE_LIST} resources"
+                "internal error: LocalLocker.lock called with more than {} resources",
+                MAX_DELETE_LIST
             )));
         }
 
@@ -165,8 +152,9 @@ impl Locker for LocalLocker {
 
     async fn unlock(&mut self, args: &LockArgs) -> Result<bool> {
         if args.resources.len() > MAX_DELETE_LIST {
-            return Err(Error::other(format!(
+            return Err(Error::from_string(format!(
-                "internal error: LocalLocker.unlock called with more than {MAX_DELETE_LIST} resources"
+                "internal error: LocalLocker.unlock called with more than {} resources",
+                MAX_DELETE_LIST
             )));
         }
 
@@ -177,9 +165,9 @@ impl Locker for LocalLocker {
                 Some(lris) => {
                     if !is_write_lock(lris) {
                         if err_info.is_empty() {
-                            err_info = format!("unlock attempted on a read locked entity: {resource}");
+                            err_info = format!("unlock attempted on a read locked entity: {}", resource);
                         } else {
-                            err_info.push_str(&format!(", {resource}"));
+                            err_info.push_str(&format!(", {}", resource));
                         }
                     } else {
                         lris.retain(|lri| {
@@ -209,7 +197,7 @@ impl Locker for LocalLocker {
 
     async fn rlock(&mut self, args: &LockArgs) -> Result<bool> {
         if args.resources.len() != 1 {
-            return Err(Error::other("internal error: localLocker.RLock called with more than one resource"));
+            return Err(Error::from_string("internal error: localLocker.RLock called with more than one resource"));
         }
 
         let resource = &args.resources[0];
@@ -253,7 +241,7 @@ impl Locker for LocalLocker {
 
     async fn runlock(&mut self, args: &LockArgs) -> Result<bool> {
         if args.resources.len() != 1 {
-            return Err(Error::other("internal error: localLocker.RLock called with more than one resource"));
+            return Err(Error::from_string("internal error: localLocker.RLock called with more than one resource"));
         }
 
         let mut reply = false;
@@ -261,7 +249,7 @@ impl Locker for LocalLocker {
         match self.lock_map.get_mut(resource) {
             Some(lris) => {
                 if is_write_lock(lris) {
-                    return Err(Error::other(format!("runlock attempted on a write locked entity: {resource}")));
+                    return Err(Error::from_string(format!("runlock attempted on a write locked entity: {}", resource)));
                 } else {
                     lris.retain(|lri| {
                         if lri.uid == args.uid && (args.owner.is_empty() || lri.owner == args.owner) {
@@ -401,8 +389,8 @@ fn format_uuid(s: &mut String, idx: &usize) {
 #[cfg(test)]
 mod test {
     use super::LocalLocker;
-    use crate::{Locker, lock_args::LockArgs};
+    use crate::{lock_args::LockArgs, Locker};
-    use std::io::Result;
+    use common::error::Result;
     use tokio;
 
     #[tokio::test]
@@ -417,10 +405,10 @@ mod test {
         };
         local_locker.lock(&args).await?;
 
-        println!("lock local_locker: {local_locker:?} \n");
+        println!("lock local_locker: {:?} \n", local_locker);
 
         local_locker.unlock(&args).await?;
-        println!("unlock local_locker: {local_locker:?}");
+        println!("unlock local_locker: {:?}", local_locker);
 
         Ok(())
     }

common/lock/src/lock_args.rs

@@ -0,0 +1,22 @@
+use std::fmt::Display;
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+pub struct LockArgs {
+    pub uid: String,
+    pub resources: Vec<String>,
+    pub owner: String,
+    pub source: String,
+    pub quorum: usize,
+}
+
+impl Display for LockArgs {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "LockArgs[ uid: {}, resources: {:?}, owner: {}, source:{}, quorum: {} ]",
+            self.uid, self.resources, self.owner, self.source, self.quorum
+        )
+    }
+}

common/lock/src/lrwmutex.rs

@@ -1,19 +1,6 @@
-// Copyright 2024 RustFS Team
+use std::time::{Duration, Instant};
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 use rand::Rng;
-use std::time::{Duration, Instant};
 use tokio::{sync::RwLock, time::sleep};
 use tracing::info;
 
@@ -90,8 +77,8 @@ impl LRWMutex {
                 }
                 let sleep_time: u64;
                 {
-                    let mut rng = rand::rng();
+                    let mut rng = rand::thread_rng();
-                    sleep_time = rng.random_range(10..=50);
+                    sleep_time = rng.gen_range(10..=50);
                 }
                 sleep(Duration::from_millis(sleep_time)).await;
             }
@@ -138,7 +125,7 @@ impl LRWMutex {
 mod test {
     use std::{sync::Arc, time::Duration};
 
-    use std::io::Result;
+    use common::error::Result;
     use tokio::time::sleep;
 
     use crate::lrwmutex::LRWMutex;

common/lock/src/namespace_lock.rs

@@ -1,28 +1,15 @@
-// Copyright 2024 RustFS Team
+use std::{collections::HashMap, path::Path, sync::Arc, time::Duration};
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 use async_trait::async_trait;
-use std::{collections::HashMap, path::Path, sync::Arc, time::Duration};
 use tokio::sync::RwLock;
 use uuid::Uuid;
 
 use crate::{
-    LockApi,
     drwmutex::{DRWMutex, Options},
     lrwmutex::LRWMutex,
+    LockApi,
 };
-use std::io::Result;
+use common::error::Result;
 
 pub type RWLockerImpl = Box<dyn RWLocker + Send + Sync>;
 
@@ -271,12 +258,12 @@ impl RWLocker for LocalLockInstance {
 mod test {
     use std::{sync::Arc, time::Duration};
 
-    use std::io::Result;
+    use common::error::Result;
     use tokio::sync::RwLock;
 
     use crate::{
         drwmutex::Options,
-        namespace_lock::{NsLockMap, new_nslock},
+        namespace_lock::{new_nslock, NsLockMap},
     };
 
     #[tokio::test]

common/lock/src/remote_client.rs

@@ -1,24 +1,11 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use crate::{Locker, lock_args::LockArgs};
 use async_trait::async_trait;
-use rustfs_protos::{node_service_time_out_client, proto_gen::node_service::GenerallyLockRequest};
+use common::error::{Error, Result};
-use std::io::{Error, Result};
+use protos::{node_service_time_out_client, proto_gen::node_service::GenerallyLockRequest};
 use tonic::Request;
 use tracing::info;
 
+use crate::{lock_args::LockArgs, Locker};
+
 #[derive(Debug, Clone)]
 pub struct RemoteClient {
     addr: String,
@@ -38,13 +25,13 @@ impl Locker for RemoteClient {
         let args = serde_json::to_string(args)?;
         let mut client = node_service_time_out_client(&self.addr)
             .await
-            .map_err(|err| Error::other(format!("can not get client, err: {err}")))?;
+            .map_err(|err| Error::from_string(format!("can not get client, err: {}", err)))?;
         let request = Request::new(GenerallyLockRequest { args });
 
-        let response = client.lock(request).await.map_err(Error::other)?.into_inner();
+        let response = client.lock(request).await?.into_inner();
 
         if let Some(error_info) = response.error_info {
-            return Err(Error::other(error_info));
+            return Err(Error::from_string(error_info));
         }
 
         Ok(response.success)
@@ -55,13 +42,13 @@ impl Locker for RemoteClient {
         let args = serde_json::to_string(args)?;
         let mut client = node_service_time_out_client(&self.addr)
             .await
-            .map_err(|err| Error::other(format!("can not get client, err: {err}")))?;
+            .map_err(|err| Error::from_string(format!("can not get client, err: {}", err)))?;
         let request = Request::new(GenerallyLockRequest { args });
 
-        let response = client.un_lock(request).await.map_err(Error::other)?.into_inner();
+        let response = client.un_lock(request).await?.into_inner();
 
         if let Some(error_info) = response.error_info {
-            return Err(Error::other(error_info));
+            return Err(Error::from_string(error_info));
         }
 
         Ok(response.success)
@@ -72,13 +59,13 @@ impl Locker for RemoteClient {
         let args = serde_json::to_string(args)?;
         let mut client = node_service_time_out_client(&self.addr)
             .await
-            .map_err(|err| Error::other(format!("can not get client, err: {err}")))?;
+            .map_err(|err| Error::from_string(format!("can not get client, err: {}", err)))?;
         let request = Request::new(GenerallyLockRequest { args });
 
-        let response = client.r_lock(request).await.map_err(Error::other)?.into_inner();
+        let response = client.r_lock(request).await?.into_inner();
 
         if let Some(error_info) = response.error_info {
-            return Err(Error::other(error_info));
+            return Err(Error::from_string(error_info));
         }
 
         Ok(response.success)
@@ -89,13 +76,13 @@ impl Locker for RemoteClient {
         let args = serde_json::to_string(args)?;
         let mut client = node_service_time_out_client(&self.addr)
             .await
-            .map_err(|err| Error::other(format!("can not get client, err: {err}")))?;
+            .map_err(|err| Error::from_string(format!("can not get client, err: {}", err)))?;
         let request = Request::new(GenerallyLockRequest { args });
 
-        let response = client.r_un_lock(request).await.map_err(Error::other)?.into_inner();
+        let response = client.r_un_lock(request).await?.into_inner();
 
         if let Some(error_info) = response.error_info {
-            return Err(Error::other(error_info));
+            return Err(Error::from_string(error_info));
         }
 
         Ok(response.success)
@@ -106,13 +93,13 @@ impl Locker for RemoteClient {
         let args = serde_json::to_string(args)?;
         let mut client = node_service_time_out_client(&self.addr)
             .await
-            .map_err(|err| Error::other(format!("can not get client, err: {err}")))?;
+            .map_err(|err| Error::from_string(format!("can not get client, err: {}", err)))?;
         let request = Request::new(GenerallyLockRequest { args });
 
-        let response = client.refresh(request).await.map_err(Error::other)?.into_inner();
+        let response = client.refresh(request).await?.into_inner();
 
         if let Some(error_info) = response.error_info {
-            return Err(Error::other(error_info));
+            return Err(Error::from_string(error_info));
         }
 
         Ok(response.success)
@@ -123,13 +110,13 @@ impl Locker for RemoteClient {
         let args = serde_json::to_string(args)?;
         let mut client = node_service_time_out_client(&self.addr)
             .await
-            .map_err(|err| Error::other(format!("can not get client, err: {err}")))?;
+            .map_err(|err| Error::from_string(format!("can not get client, err: {}", err)))?;
         let request = Request::new(GenerallyLockRequest { args });
 
-        let response = client.force_un_lock(request).await.map_err(Error::other)?.into_inner();
+        let response = client.force_un_lock(request).await?.into_inner();
 
         if let Some(error_info) = response.error_info {
-            return Err(Error::other(error_info));
+            return Err(Error::from_string(error_info));
         }
 
         Ok(response.success)

common/protos/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "protos"
+version.workspace = true
+edition.workspace = true
+
+[lints]
+workspace = true
+
+[[bin]]
+name = "gproto"
+path = "src/main.rs"
+
+[dependencies]
+#async-backtrace = { workspace = true, optional = true }
+common.workspace = true
+flatbuffers = { workspace = true }
+prost = { workspace = true }
+protobuf = { workspace = true }
+tokio = { workspace = true }
+tonic = { workspace = true, features = ["transport"] }
+tower = { workspace = true }
+prost-build = { workspace = true }
+tonic-build = { workspace = true }

common/protos/src/generated/flatbuffers_generated/mod.rs

@@ -0,0 +1 @@
+pub mod models;

common/protos/src/generated/flatbuffers_generated/models.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // automatically generated by the FlatBuffers compiler, do not modify
 
 // @generated
@@ -43,7 +29,7 @@ pub mod models {
         #[inline]
         unsafe fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
             Self {
-                _tab: unsafe { flatbuffers::Table::new(buf, loc) },
+                _tab: flatbuffers::Table::new(buf, loc),
             }
         }
     }

common/protos/src/generated/mod.rs

@@ -0,0 +1,6 @@
+#![allow(unused_imports)]
+#![allow(clippy::all)]
+pub mod proto_gen;
+
+mod flatbuffers_generated;
+pub use flatbuffers_generated::models::*;

common/protos/src/generated/proto_gen/mod.rs

@@ -0,0 +1 @@
+pub mod node_service;

common/protos/src/generated/proto_gen/node_service.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // This file is @generated by prost-build.
 /// --------------------------------------------------------------------
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -25,15 +11,15 @@ pub struct Error {
 pub struct PingRequest {
     #[prost(uint64, tag = "1")]
     pub version: u64,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub body: ::prost::bytes::Bytes,
+    pub body: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PingResponse {
     #[prost(uint64, tag = "1")]
     pub version: u64,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub body: ::prost::bytes::Bytes,
+    pub body: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct HealBucketRequest {
@@ -119,8 +105,8 @@ pub struct ReadAllRequest {
 pub struct ReadAllResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub data: ::prost::bytes::Bytes,
+    pub data: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "3")]
     pub error: ::core::option::Option<Error>,
 }
@@ -133,8 +119,8 @@ pub struct WriteAllRequest {
     pub volume: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
     pub path: ::prost::alloc::string::String,
-    #[prost(bytes = "bytes", tag = "4")]
+    #[prost(bytes = "vec", tag = "4")]
-    pub data: ::prost::bytes::Bytes,
+    pub data: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WriteAllResponse {
@@ -205,7 +191,7 @@ pub struct CheckPartsResponse {
     pub error: ::core::option::Option<Error>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RenamePartRequest {
+pub struct RenamePartRequst {
     #[prost(string, tag = "1")]
     pub disk: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
@@ -216,8 +202,8 @@ pub struct RenamePartRequest {
     pub dst_volume: ::prost::alloc::string::String,
     #[prost(string, tag = "5")]
     pub dst_path: ::prost::alloc::string::String,
-    #[prost(bytes = "bytes", tag = "6")]
+    #[prost(bytes = "vec", tag = "6")]
-    pub meta: ::prost::bytes::Bytes,
+    pub meta: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RenamePartResponse {
@@ -227,7 +213,7 @@ pub struct RenamePartResponse {
     pub error: ::core::option::Option<Error>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RenameFileRequest {
+pub struct RenameFileRequst {
     #[prost(string, tag = "1")]
     pub disk: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
@@ -257,8 +243,8 @@ pub struct WriteRequest {
     pub path: ::prost::alloc::string::String,
     #[prost(bool, tag = "4")]
     pub is_append: bool,
-    #[prost(bytes = "bytes", tag = "5")]
+    #[prost(bytes = "vec", tag = "5")]
-    pub data: ::prost::bytes::Bytes,
+    pub data: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WriteResponse {
@@ -285,8 +271,8 @@ pub struct ReadAtRequest {
 pub struct ReadAtResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub data: ::prost::bytes::Bytes,
+    pub data: ::prost::alloc::vec::Vec<u8>,
     #[prost(int64, tag = "3")]
     pub read_size: i64,
     #[prost(message, optional, tag = "4")]
@@ -314,8 +300,8 @@ pub struct WalkDirRequest {
     /// indicate which one in the disks
     #[prost(string, tag = "1")]
     pub disk: ::prost::alloc::string::String,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub walk_dir_options: ::prost::bytes::Bytes,
+    pub walk_dir_options: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WalkDirResponse {
@@ -647,8 +633,8 @@ pub struct LocalStorageInfoRequest {
 pub struct LocalStorageInfoResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub storage_info: ::prost::bytes::Bytes,
+    pub storage_info: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -661,8 +647,8 @@ pub struct ServerInfoRequest {
 pub struct ServerInfoResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub server_properties: ::prost::bytes::Bytes,
+    pub server_properties: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -672,8 +658,8 @@ pub struct GetCpusRequest {}
 pub struct GetCpusResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub cpus: ::prost::bytes::Bytes,
+    pub cpus: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -683,8 +669,8 @@ pub struct GetNetInfoRequest {}
 pub struct GetNetInfoResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub net_info: ::prost::bytes::Bytes,
+    pub net_info: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -694,8 +680,8 @@ pub struct GetPartitionsRequest {}
 pub struct GetPartitionsResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub partitions: ::prost::bytes::Bytes,
+    pub partitions: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -705,8 +691,8 @@ pub struct GetOsInfoRequest {}
 pub struct GetOsInfoResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub os_info: ::prost::bytes::Bytes,
+    pub os_info: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -716,8 +702,8 @@ pub struct GetSeLinuxInfoRequest {}
 pub struct GetSeLinuxInfoResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub sys_services: ::prost::bytes::Bytes,
+    pub sys_services: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -727,8 +713,8 @@ pub struct GetSysConfigRequest {}
 pub struct GetSysConfigResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub sys_config: ::prost::bytes::Bytes,
+    pub sys_config: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -738,8 +724,8 @@ pub struct GetSysErrorsRequest {}
 pub struct GetSysErrorsResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub sys_errors: ::prost::bytes::Bytes,
+    pub sys_errors: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -749,24 +735,24 @@ pub struct GetMemInfoRequest {}
 pub struct GetMemInfoResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub mem_info: ::prost::bytes::Bytes,
+    pub mem_info: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetMetricsRequest {
-    #[prost(bytes = "bytes", tag = "1")]
+    #[prost(bytes = "vec", tag = "1")]
-    pub metric_type: ::prost::bytes::Bytes,
+    pub metric_type: ::prost::alloc::vec::Vec<u8>,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub opts: ::prost::bytes::Bytes,
+    pub opts: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetMetricsResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub realtime_metrics: ::prost::bytes::Bytes,
+    pub realtime_metrics: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -776,8 +762,8 @@ pub struct GetProcInfoRequest {}
 pub struct GetProcInfoResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub proc_info: ::prost::bytes::Bytes,
+    pub proc_info: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -800,7 +786,7 @@ pub struct DownloadProfileDataResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
     #[prost(map = "string, bytes", tag = "2")]
-    pub data: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::bytes::Bytes>,
+    pub data: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::vec::Vec<u8>>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -813,8 +799,8 @@ pub struct GetBucketStatsDataRequest {
 pub struct GetBucketStatsDataResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub bucket_stats: ::prost::bytes::Bytes,
+    pub bucket_stats: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -824,8 +810,8 @@ pub struct GetSrMetricsDataRequest {}
 pub struct GetSrMetricsDataResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub sr_metrics_summary: ::prost::bytes::Bytes,
+    pub sr_metrics_summary: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -835,8 +821,8 @@ pub struct GetAllBucketStatsRequest {}
 pub struct GetAllBucketStatsResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub bucket_stats_map: ::prost::bytes::Bytes,
+    pub bucket_stats_map: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -993,36 +979,36 @@ pub struct BackgroundHealStatusRequest {}
 pub struct BackgroundHealStatusResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub bg_heal_state: ::prost::bytes::Bytes,
+    pub bg_heal_state: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetMetacacheListingRequest {
-    #[prost(bytes = "bytes", tag = "1")]
+    #[prost(bytes = "vec", tag = "1")]
-    pub opts: ::prost::bytes::Bytes,
+    pub opts: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetMetacacheListingResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub metacache: ::prost::bytes::Bytes,
+    pub metacache: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UpdateMetacacheListingRequest {
-    #[prost(bytes = "bytes", tag = "1")]
+    #[prost(bytes = "vec", tag = "1")]
-    pub metacache: ::prost::bytes::Bytes,
+    pub metacache: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UpdateMetacacheListingResponse {
     #[prost(bool, tag = "1")]
     pub success: bool,
-    #[prost(bytes = "bytes", tag = "2")]
+    #[prost(bytes = "vec", tag = "2")]
-    pub metacache: ::prost::bytes::Bytes,
+    pub metacache: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, optional, tag = "3")]
     pub error_info: ::core::option::Option<::prost::alloc::string::String>,
 }
@@ -1105,9 +1091,9 @@ pub mod node_service_client {
             F: tonic::service::Interceptor,
             T::ResponseBody: Default,
             T: tonic::codegen::Service<
-                    http::Request<tonic::body::Body>,
+                http::Request<tonic::body::Body>,
-                    Response = http::Response<<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody>,
+                Response = http::Response<<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody>,
-                >,
+            >,
             <T as tonic::codegen::Service<http::Request<tonic::body::Body>>>::Error:
                 Into<StdError> + std::marker::Send + std::marker::Sync,
         {
@@ -1312,7 +1298,7 @@ pub mod node_service_client {
         }
         pub async fn rename_part(
             &mut self,
-            request: impl tonic::IntoRequest<super::RenamePartRequest>,
+            request: impl tonic::IntoRequest<super::RenamePartRequst>,
         ) -> std::result::Result<tonic::Response<super::RenamePartResponse>, tonic::Status> {
             self.inner
                 .ready()
@@ -1327,7 +1313,7 @@ pub mod node_service_client {
         }
         pub async fn rename_file(
             &mut self,
-            request: impl tonic::IntoRequest<super::RenameFileRequest>,
+            request: impl tonic::IntoRequest<super::RenameFileRequst>,
         ) -> std::result::Result<tonic::Response<super::RenameFileResponse>, tonic::Status> {
             self.inner
                 .ready()
@@ -2344,11 +2330,11 @@ pub mod node_service_server {
         ) -> std::result::Result<tonic::Response<super::CheckPartsResponse>, tonic::Status>;
         async fn rename_part(
             &self,
-            request: tonic::Request<super::RenamePartRequest>,
+            request: tonic::Request<super::RenamePartRequst>,
         ) -> std::result::Result<tonic::Response<super::RenamePartResponse>, tonic::Status>;
         async fn rename_file(
             &self,
-            request: tonic::Request<super::RenameFileRequest>,
+            request: tonic::Request<super::RenameFileRequst>,
         ) -> std::result::Result<tonic::Response<super::RenameFileResponse>, tonic::Status>;
         async fn write(
             &self,
@@ -3003,10 +2989,10 @@ pub mod node_service_server {
                 "/node_service.NodeService/RenamePart" => {
                     #[allow(non_camel_case_types)]
                     struct RenamePartSvc<T: NodeService>(pub Arc<T>);
-                    impl<T: NodeService> tonic::server::UnaryService<super::RenamePartRequest> for RenamePartSvc<T> {
+                    impl<T: NodeService> tonic::server::UnaryService<super::RenamePartRequst> for RenamePartSvc<T> {
                         type Response = super::RenamePartResponse;
                         type Future = BoxFuture<tonic::Response<Self::Response>, tonic::Status>;
-                        fn call(&mut self, request: tonic::Request<super::RenamePartRequest>) -> Self::Future {
+                        fn call(&mut self, request: tonic::Request<super::RenamePartRequst>) -> Self::Future {
                             let inner = Arc::clone(&self.0);
                             let fut = async move { <T as NodeService>::rename_part(&inner, request).await };
                             Box::pin(fut)
@@ -3031,10 +3017,10 @@ pub mod node_service_server {
                 "/node_service.NodeService/RenameFile" => {
                     #[allow(non_camel_case_types)]
                     struct RenameFileSvc<T: NodeService>(pub Arc<T>);
-                    impl<T: NodeService> tonic::server::UnaryService<super::RenameFileRequest> for RenameFileSvc<T> {
+                    impl<T: NodeService> tonic::server::UnaryService<super::RenameFileRequst> for RenameFileSvc<T> {
                         type Response = super::RenameFileResponse;
                         type Future = BoxFuture<tonic::Response<Self::Response>, tonic::Status>;
-                        fn call(&mut self, request: tonic::Request<super::RenameFileRequest>) -> Self::Future {
+                        fn call(&mut self, request: tonic::Request<super::RenameFileRequst>) -> Self::Future {
                             let inner = Arc::clone(&self.0);
                             let fut = async move { <T as NodeService>::rename_file(&inner, request).await };
                             Box::pin(fut)

common/protos/src/lib.rs

@@ -1,30 +1,16 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 #[allow(unsafe_code)]
 mod generated;
 
 use std::{error::Error, time::Duration};
 
+use common::globals::GLOBAL_Conn_Map;
 pub use generated::*;
 use proto_gen::node_service::node_service_client::NodeServiceClient;
-use rustfs_common::globals::GLOBAL_Conn_Map;
 use tonic::{
-    Request, Status,
     metadata::MetadataValue,
     service::interceptor::InterceptedService,
     transport::{Channel, Endpoint},
+    Request, Status,
 };
 
 // Default 100 MB

common/protos/src/main.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use std::{cmp, env, fs, io::Write, path::Path, process::Command};
 
 type AnyError = Box<dyn std::error::Error>;
@@ -45,7 +31,7 @@ fn main() -> Result<(), AnyError> {
     }
 
     // path of proto file
-    let project_root_dir = env::current_dir()?.join("");
+    let project_root_dir = env::current_dir()?.join("common/protos/src");
     let proto_dir = project_root_dir.clone();
     let proto_files = &["node.proto"];
     let proto_out_dir = project_root_dir.join("generated").join("proto_gen");
@@ -57,7 +43,6 @@ fn main() -> Result<(), AnyError> {
         // .file_descriptor_set_path(descriptor_set_path)
         .protoc_arg("--experimental_allow_proto3_optional")
         .compile_well_known_types(true)
-        .bytes(["."])
         .emit_rerun_if_changed(false)
         .compile_protos(proto_files, &[proto_dir.clone()])
         .map_err(|e| format!("Failed to generate protobuf file: {e}."))?;
@@ -275,11 +260,11 @@ fn fmt() {
             if status.success() {
                 println!("cargo fmt executed successfully.");
             } else {
-                eprintln!("cargo fmt failed with status: {status:?}");
+                eprintln!("cargo fmt failed with status: {:?}", status);
             }
         }
         Err(e) => {
-            eprintln!("Failed to execute cargo fmt: {e}");
+            eprintln!("Failed to execute cargo fmt: {}", e);
         }
     }
 }

common/protos/src/node.proto

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 syntax = "proto3";
 package node_service;
 
@@ -143,7 +129,7 @@ message CheckPartsResponse {
   optional Error error = 3;
 }
 
-message RenamePartRequest {
+message RenamePartRequst {
   string disk = 1;
   string src_volume = 2;
   string src_path = 3;
@@ -157,7 +143,7 @@ message RenamePartResponse {
   optional Error error = 2;
 }
 
-message RenameFileRequest {
+message RenameFileRequst {
   string disk = 1;
   string src_volume = 2;
   string src_path = 3;
@@ -189,7 +175,7 @@ message WriteResponse {
 //   string path = 3;
 //   bytes data = 4;
 // }
-//
+// 
 // message AppendResponse {
 //   bool success = 1;
 //   optional Error error = 2;
@@ -769,8 +755,8 @@ service NodeService {
   rpc Delete(DeleteRequest) returns (DeleteResponse) {};
   rpc VerifyFile(VerifyFileRequest) returns (VerifyFileResponse) {};
   rpc CheckParts(CheckPartsRequest) returns (CheckPartsResponse) {};
-  rpc RenamePart(RenamePartRequest) returns (RenamePartResponse) {};
+  rpc RenamePart(RenamePartRequst) returns (RenamePartResponse) {};
-  rpc RenameFile(RenameFileRequest) returns (RenameFileResponse) {};
+  rpc RenameFile(RenameFileRequst) returns (RenameFileResponse) {};
   rpc Write(WriteRequest) returns (WriteResponse) {};
   rpc WriteStream(stream WriteRequest) returns (stream WriteResponse) {};
 //  rpc Append(AppendRequest) returns (AppendResponse) {};

common/workers/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "workers"
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+common.workspace = true
+tokio.workspace = true
+tracing.workspace = true

common/workers/src/lib.rs

@@ -0,0 +1 @@
+pub mod workers;

common/workers/src/workers.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use std::sync::Arc;
 use tokio::sync::{Mutex, Notify};
 use tracing::info;

crates/appauth/Cargo.toml

@@ -1,30 +0,0 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-[package]
-name = "rustfs-appauth"
-edition.workspace = true
-license.workspace = true
-repository.workspace = true
-rust-version.workspace = true
-version.workspace = true
-
-[dependencies]
-base64-simd = { workspace = true }
-rsa = { workspace = true }
-serde.workspace = true
-serde_json.workspace = true
-
-[lints]
-workspace = true

crates/appauth/src/lib.rs

@@ -1,15 +0,0 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod token;

crates/common/Cargo.toml

@@ -1,29 +0,0 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-[package]
-name = "rustfs-common"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-repository.workspace = true
-rust-version.workspace = true
-
-[lints]
-workspace = true
-
-[dependencies]
-lazy_static.workspace = true
-tokio.workspace = true
-tonic = { workspace = true }

crates/common/src/lib.rs

@@ -1,41 +0,0 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod bucket_stats;
-// pub mod error;
-pub mod globals;
-pub mod last_minute;
-
-// is ','
-pub static DEFAULT_DELIMITER: u8 = 44;
-
-/// Defers evaluation of a block of code until the end of the scope.
-#[macro_export]
-macro_rules! defer {
-    ($($body:tt)*) => {
-        let _guard = {
-            pub struct Guard<F: FnOnce()>(Option<F>);
-
-            impl<F: FnOnce()> Drop for Guard<F> {
-                fn drop(&mut self) {
-                    (self.0).take().map(|f| f());
-                }
-            }
-
-            Guard(Some(|| {
-                let _ = { $($body)* };
-            }))
-        };
-    };
-}

crates/config/Cargo.toml

@@ -1,17 +1,3 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 [package]
 name = "rustfs-config"
 edition.workspace = true
@@ -21,17 +7,22 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-const-str = { workspace = true, optional = true }
+config = { workspace = true }
+const-str = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+tokio = { workspace = true, features = ["sync", "rt"] }
+once_cell = { workspace = true }
+thiserror = { workspace = true }
+tracing = { workspace = true }
 
+[dev-dependencies]
+tokio = { workspace = true, features = [
+    "sync",
+    "rt",
+    "macros",
+    "rt-multi-thread",
+] }
 
 [lints]
 workspace = true
-
-[features]
-default = []
-constants = ["dep:const-str"]
-notify = ["dep:const-str"]
-observability = []
-

crates/config/src/config.rs

@@ -0,0 +1,200 @@
+use crate::event::config::NotifierConfig;
+use crate::ObservabilityConfig;
+
+/// RustFs configuration
+pub struct RustFsConfig {
+    pub observability: ObservabilityConfig,
+    pub event: NotifierConfig,
+}
+
+impl RustFsConfig {
+    pub fn new() -> Self {
+        Self {
+            observability: ObservabilityConfig::new(),
+            event: NotifierConfig::new(),
+        }
+    }
+}
+
+impl Default for RustFsConfig {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_rustfs_config_new() {
+        let config = RustFsConfig::new();
+
+        // Verify that observability config is properly initialized
+        assert!(!config.observability.sinks.is_empty(), "Observability sinks should not be empty");
+        assert!(config.observability.logger.is_some(), "Logger config should be present");
+
+        // Verify that event config is properly initialized
+        assert!(!config.event.store_path.is_empty(), "Event store path should not be empty");
+        assert!(config.event.channel_capacity > 0, "Channel capacity should be positive");
+        assert!(!config.event.adapters.is_empty(), "Event adapters should not be empty");
+    }
+
+    #[test]
+    fn test_rustfs_config_default() {
+        let config = RustFsConfig::default();
+
+        // Default should be equivalent to new()
+        let new_config = RustFsConfig::new();
+
+        // Compare observability config
+        assert_eq!(config.observability.sinks.len(), new_config.observability.sinks.len());
+        assert_eq!(config.observability.logger.is_some(), new_config.observability.logger.is_some());
+
+        // Compare event config
+        assert_eq!(config.event.store_path, new_config.event.store_path);
+        assert_eq!(config.event.channel_capacity, new_config.event.channel_capacity);
+        assert_eq!(config.event.adapters.len(), new_config.event.adapters.len());
+    }
+
+    #[test]
+    fn test_rustfs_config_components_independence() {
+        let mut config = RustFsConfig::new();
+
+        // Modify observability config
+        config.observability.sinks.clear();
+
+        // Event config should remain unchanged
+        assert!(!config.event.adapters.is_empty(), "Event adapters should remain unchanged");
+        assert!(config.event.channel_capacity > 0, "Channel capacity should remain unchanged");
+
+        // Create new config to verify independence
+        let new_config = RustFsConfig::new();
+        assert!(!new_config.observability.sinks.is_empty(), "New config should have default sinks");
+    }
+
+    #[test]
+    fn test_rustfs_config_observability_integration() {
+        let config = RustFsConfig::new();
+
+        // Test observability config properties
+        assert!(config.observability.otel.endpoint.is_empty() || !config.observability.otel.endpoint.is_empty());
+        assert!(config.observability.otel.use_stdout.is_some());
+        assert!(config.observability.otel.sample_ratio.is_some());
+        assert!(config.observability.otel.meter_interval.is_some());
+        assert!(config.observability.otel.service_name.is_some());
+        assert!(config.observability.otel.service_version.is_some());
+        assert!(config.observability.otel.environment.is_some());
+        assert!(config.observability.otel.logger_level.is_some());
+    }
+
+    #[test]
+    fn test_rustfs_config_event_integration() {
+        let config = RustFsConfig::new();
+
+        // Test event config properties
+        assert!(!config.event.store_path.is_empty(), "Store path should not be empty");
+        assert!(
+            config.event.channel_capacity >= 1000,
+            "Channel capacity should be reasonable for production"
+        );
+
+        // Test that store path is a valid path format
+        let store_path = &config.event.store_path;
+        assert!(!store_path.contains('\0'), "Store path should not contain null characters");
+
+        // Test adapters configuration
+        for adapter in &config.event.adapters {
+            // Each adapter should have a valid configuration
+            match adapter {
+                crate::event::adapters::AdapterConfig::Webhook(_) => {
+                    // Webhook adapter should be properly configured
+                }
+                crate::event::adapters::AdapterConfig::Kafka(_) => {
+                    // Kafka adapter should be properly configured
+                }
+                crate::event::adapters::AdapterConfig::Mqtt(_) => {
+                    // MQTT adapter should be properly configured
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_rustfs_config_memory_usage() {
+        // Test that config doesn't use excessive memory
+        let config = RustFsConfig::new();
+
+        // Basic memory usage checks
+        assert!(std::mem::size_of_val(&config) < 10000, "Config should not use excessive memory");
+
+        // Test that strings are not excessively long
+        assert!(config.event.store_path.len() < 1000, "Store path should not be excessively long");
+
+        // Test that collections are reasonably sized
+        assert!(config.observability.sinks.len() < 100, "Sinks collection should be reasonably sized");
+        assert!(config.event.adapters.len() < 100, "Adapters collection should be reasonably sized");
+    }
+
+    #[test]
+    fn test_rustfs_config_serialization_compatibility() {
+        let config = RustFsConfig::new();
+
+        // Test that observability config can be serialized (it has Serialize trait)
+        let observability_json = serde_json::to_string(&config.observability);
+        assert!(observability_json.is_ok(), "Observability config should be serializable");
+
+        // Test that event config can be serialized (it has Serialize trait)
+        let event_json = serde_json::to_string(&config.event);
+        assert!(event_json.is_ok(), "Event config should be serializable");
+    }
+
+    #[test]
+    fn test_rustfs_config_debug_format() {
+        let config = RustFsConfig::new();
+
+        // Test that observability config has Debug trait
+        let observability_debug = format!("{:?}", config.observability);
+        assert!(!observability_debug.is_empty(), "Observability config should have debug output");
+        assert!(
+            observability_debug.contains("ObservabilityConfig"),
+            "Debug output should contain type name"
+        );
+
+        // Test that event config has Debug trait
+        let event_debug = format!("{:?}", config.event);
+        assert!(!event_debug.is_empty(), "Event config should have debug output");
+        assert!(event_debug.contains("NotifierConfig"), "Debug output should contain type name");
+    }
+
+    #[test]
+    fn test_rustfs_config_clone_behavior() {
+        let config = RustFsConfig::new();
+
+        // Test that observability config can be cloned
+        let observability_clone = config.observability.clone();
+        assert_eq!(observability_clone.sinks.len(), config.observability.sinks.len());
+
+        // Test that event config can be cloned
+        let event_clone = config.event.clone();
+        assert_eq!(event_clone.store_path, config.event.store_path);
+        assert_eq!(event_clone.channel_capacity, config.event.channel_capacity);
+    }
+
+    #[test]
+    fn test_rustfs_config_environment_independence() {
+        // Test that config creation doesn't depend on specific environment variables
+        // This test ensures the config can be created in any environment
+
+        let config1 = RustFsConfig::new();
+        let config2 = RustFsConfig::new();
+
+        // Both configs should have the same structure
+        assert_eq!(config1.observability.sinks.len(), config2.observability.sinks.len());
+        assert_eq!(config1.event.adapters.len(), config2.event.adapters.len());
+
+        // Store paths should be consistent
+        assert_eq!(config1.event.store_path, config2.event.store_path);
+        assert_eq!(config1.event.channel_capacity, config2.event.channel_capacity);
+    }
+}

crates/config/src/constants/app.rs

@@ -1,17 +1,3 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use const_str::concat;
 
 /// Application name
@@ -115,7 +101,7 @@ pub const DEFAULT_LOG_FILENAME: &str = "rustfs.log";
 /// It is used to store the logs of the application.
 /// Default value: logs
 /// Environment variable: RUSTFS_OBSERVABILITY_LOG_DIRECTORY
-pub const DEFAULT_LOG_DIR: &str = "deploy/logs";
+pub const DEFAULT_LOG_DIR: &str = "logs";
 
 /// Default log rotation size mb for rustfs
 /// This is the default log rotation size for rustfs.
@@ -214,7 +200,7 @@ mod tests {
         // Test port related constants
         assert_eq!(DEFAULT_PORT, 9000);
 
-        assert_eq!(DEFAULT_CONSOLE_PORT, 9001);
+        assert_eq!(DEFAULT_CONSOLE_PORT, 9002);
 
         assert_ne!(DEFAULT_PORT, DEFAULT_CONSOLE_PORT, "Main port and console port should be different");
     }
@@ -229,7 +215,7 @@ mod tests {
             "Address should contain the default port"
         );
 
-        assert_eq!(DEFAULT_CONSOLE_ADDRESS, ":9001");
+        assert_eq!(DEFAULT_CONSOLE_ADDRESS, ":9002");
         assert!(DEFAULT_CONSOLE_ADDRESS.starts_with(':'), "Console address should start with colon");
         assert!(
             DEFAULT_CONSOLE_ADDRESS.contains(&DEFAULT_CONSOLE_PORT.to_string()),
@@ -245,10 +231,10 @@ mod tests {
     #[test]
     fn test_const_str_concat_functionality() {
         // Test const_str::concat macro functionality
-        let expected_address = format!(":{DEFAULT_PORT}");
+        let expected_address = format!(":{}", DEFAULT_PORT);
         assert_eq!(DEFAULT_ADDRESS, expected_address);
 
-        let expected_console_address = format!(":{DEFAULT_CONSOLE_PORT}");
+        let expected_console_address = format!(":{}", DEFAULT_CONSOLE_PORT);
         assert_eq!(DEFAULT_CONSOLE_ADDRESS, expected_console_address);
     }
 
@@ -270,9 +256,9 @@ mod tests {
         ];
 
         for constant in &string_constants {
-            assert!(!constant.is_empty(), "String constant should not be empty: {constant}");
+            assert!(!constant.is_empty(), "String constant should not be empty: {}", constant);
-            assert!(!constant.starts_with(' '), "String constant should not start with space: {constant}");
+            assert!(!constant.starts_with(' '), "String constant should not start with space: {}", constant);
-            assert!(!constant.ends_with(' '), "String constant should not end with space: {constant}");
+            assert!(!constant.ends_with(' '), "String constant should not end with space: {}", constant);
         }
     }
 
@@ -298,8 +284,8 @@ mod tests {
 
         // These are default values, should be changed in production environments
         println!("Security Warning: Default credentials detected!");
-        println!("Access Key: {DEFAULT_ACCESS_KEY}");
+        println!("Access Key: {}", DEFAULT_ACCESS_KEY);
-        println!("Secret Key: {DEFAULT_SECRET_KEY}");
+        println!("Secret Key: {}", DEFAULT_SECRET_KEY);
         println!("These should be changed in production environments!");
 
         // Verify that key lengths meet minimum security requirements
@@ -326,11 +312,11 @@ mod tests {
         let ports = [DEFAULT_PORT, DEFAULT_CONSOLE_PORT];
         let mut unique_ports = std::collections::HashSet::new();
         for port in &ports {
-            assert!(unique_ports.insert(port), "Port {port} is duplicated");
+            assert!(unique_ports.insert(port), "Port {} is duplicated", port);
         }
 
         // Address format consistency
-        assert_eq!(DEFAULT_ADDRESS, format!(":{DEFAULT_PORT}"));
+        assert_eq!(DEFAULT_ADDRESS, format!(":{}", DEFAULT_PORT));
-        assert_eq!(DEFAULT_CONSOLE_ADDRESS, format!(":{DEFAULT_CONSOLE_PORT}"));
+        assert_eq!(DEFAULT_CONSOLE_ADDRESS, format!(":{}", DEFAULT_CONSOLE_PORT));
     }
 }