refact error

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

ecstore/src/bucket_meta.rs

@@ -2,7 +2,7 @@ use rmp_serde::Serializer;
 use serde::{Deserialize, Serialize};
 use time::OffsetDateTime;
 
-use common::error::Result;
+use crate::error::Result;
 
 use crate::disk::BUCKET_META_PREFIX;
 

ecstore/src/chunk_stream.rs

@@ -1,5 +1,5 @@
+use crate::error::StdError;
 use bytes::Bytes;
-use common::error::StdError;
 use futures::pin_mut;
 use futures::stream::{Stream, StreamExt};
 use std::future::Future;

ecstore/src/disk/endpoint.rs

@@ -1,5 +1,5 @@
+use crate::error::{Error, Result};
 use crate::utils::net;
-use common::error::{Error, Result};
 use path_absolutize::Absolutize;
 use path_clean::PathClean;
 use std::{fmt::Display, path::Path};

ecstore/src/disk/error.rs

@@ -1,4 +1,4 @@
-use common::error::{Error, Result};
+use crate::error::{Error, Result};
 
 #[derive(Debug, thiserror::Error)]
 pub enum DiskError {

ecstore/src/disk/format.rs

@@ -1,5 +1,5 @@
 use super::error::DiskError;
-use common::error::{Error, Result};
+use crate::error::{Error, Result};
 use serde::{Deserialize, Serialize};
 use serde_json::Error as JsonError;
 use uuid::Uuid;

ecstore/src/disk/local.rs

@@ -4,13 +4,13 @@ use super::{
     ReadOptions, RenameDataResp, VolumeInfo, WalkDirOptions,
 };
 use crate::disk::{LocalFileReader, LocalFileWriter, STORAGE_FORMAT_FILE};
+use crate::error::{Error, Result};
 use crate::{
     file_meta::FileMeta,
     store_api::{FileInfo, RawFileInfo},
     utils,
 };
 use bytes::Bytes;
-use common::error::{Error, Result};
 use path_absolutize::Absolutize;
 use std::{
     fs::Metadata,

ecstore/src/disk/mod.rs

@@ -14,11 +14,11 @@ const STORAGE_FORMAT_FILE: &str = "xl.meta";
 
 use crate::{
     erasure::{ReadAt, Write},
+    error::{Error, Result},
     file_meta::FileMeta,
     store_api::{FileInfo, RawFileInfo},
 };
 use bytes::Bytes;
-use common::error::{Error, Result};
 use futures::StreamExt;
 use protos::proto_gen::node_service::{
     node_service_client::NodeServiceClient, ReadAtRequest, ReadAtResponse, WriteRequest, WriteResponse,

ecstore/src/disk/remote.rs

@@ -1,7 +1,6 @@
 use std::path::PathBuf;
 
 use bytes::Bytes;
-use common::error::{Error, Result};
 use futures::lock::Mutex;
 use protos::{
     node_service_time_out_client,
@@ -17,6 +16,7 @@ use uuid::Uuid;
 
 use crate::{
     disk::error::DiskError,
+    error::{Error, Result},
     store_api::{FileInfo, RawFileInfo},
 };
 

ecstore/src/disks_layout.rs

@@ -1,5 +1,5 @@
+use crate::error::{Error, Result};
 use crate::utils::ellipses::*;
-use common::error::{Error, Result};
 use serde::Deserialize;
 use std::collections::HashSet;
 

ecstore/src/endpoints.rs

@@ -1,9 +1,9 @@
 use crate::{
     disk::endpoint::{Endpoint, EndpointType},
     disks_layout::DisksLayout,
+    error::{Error, Result},
     utils::net,
 };
-use common::error::{Error, Result};
 use std::{
     collections::{hash_map::Entry, HashMap, HashSet},
     net::IpAddr,

ecstore/src/erasure.rs

@@ -1,5 +1,5 @@
+use crate::error::{Error, Result, StdError};
 use bytes::Bytes;
-use common::error::{Error, Result, StdError};
 use futures::future::join_all;
 use futures::{Stream, StreamExt};
 use reed_solomon_erasure::galois_8::ReedSolomon;

ecstore/src/error.rs

@@ -0,0 +1,82 @@
+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()
+    }
+}
+
+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(())
+    }
+}

ecstore/src/lib.rs

@@ -4,6 +4,7 @@ pub mod disk;
 pub mod disks_layout;
 pub mod endpoints;
 pub mod erasure;
+pub mod error;
 mod file_meta;
 pub mod peer;
 pub mod set_disk;

ecstore/src/peer.rs

@@ -1,5 +1,4 @@
 use async_trait::async_trait;
-use common::error::{Error, Result};
 use futures::future::join_all;
 use protos::node_service_time_out_client;
 use protos::proto_gen::node_service::{DeleteBucketRequest, GetBucketInfoRequest, ListBucketRequest, MakeBucketRequest};
@@ -12,6 +11,7 @@ use crate::store::all_local_disk;
 use crate::{
     disk::{self, error::DiskError, VolumeInfo},
     endpoints::{EndpointServerPools, Node},
+    error::{Error, Result},
     store_api::{BucketInfo, BucketOptions, MakeBucketOptions},
 };
 

ecstore/src/sets.rs

@@ -1,6 +1,5 @@
 use std::{collections::HashMap, sync::Arc};
 
-use common::error::{Error, Result};
 use common::globals::GLOBAL_Local_Node_Name;
 use futures::future::join_all;
 use http::HeaderMap;
@@ -14,6 +13,7 @@ use crate::{
         DiskStore,
     },
     endpoints::PoolEndpoints,
+    error::{Error, Result},
     set_disk::SetDisks,
     store::{GLOBAL_IsDistErasure, GLOBAL_LOCAL_DISK_SET_DRIVES},
     store_api::{

ecstore/src/store.rs

@@ -5,6 +5,7 @@ use crate::{
         BUCKET_META_PREFIX, RUSTFS_META_BUCKET,
     },
     endpoints::{EndpointServerPools, SetupType},
+    error::{Error, Result},
     peer::S3PeerSys,
     sets::Sets,
     store_api::{
@@ -15,7 +16,6 @@ use crate::{
     store_init, utils,
 };
 use backon::{ExponentialBuilder, Retryable};
-use common::error::{Error, Result};
 use common::globals::{GLOBAL_Local_Node_Name, GLOBAL_Rustfs_Host, GLOBAL_Rustfs_Port};
 use futures::future::join_all;
 use http::HeaderMap;

ecstore/src/store_api.rs

@@ -1,4 +1,4 @@
-use common::error::{Error, Result};
+use crate::error::{Error, Result};
 use http::HeaderMap;
 use rmp_serde::Serializer;
 use s3s::dto::StreamingBlob;

ecstore/src/store_init.rs

@@ -5,8 +5,8 @@ use crate::{
         new_disk, DiskOption, DiskStore, FORMAT_CONFIG_FILE, RUSTFS_META_BUCKET,
     },
     endpoints::Endpoints,
+    error::{Error, Result},
 };
-use common::error::{Error, Result};
 use futures::future::join_all;
 use std::{
     collections::{hash_map::Entry, HashMap},

ecstore/src/utils/ellipses.rs

@@ -1,4 +1,4 @@
-use common::error::{Error, Result};
+use crate::error::{Error, Result};
 use lazy_static::*;
 use regex::Regex;
 

ecstore/src/utils/net.rs

@@ -1,4 +1,4 @@
-use common::error::{Error, Result};
+use crate::error::{Error, Result};
 use lazy_static::lazy_static;
 use std::{
     collections::HashSet,

rustfs/src/main.rs

@@ -4,7 +4,7 @@ mod service;
 mod storage;
 
 use clap::Parser;
-use common::error::Result;
+use common::error::{Error, Result};
 use ecstore::{
     endpoints::EndpointServerPools,
     store::{init_local_disks, update_erasure_type, ECStore},
@@ -87,12 +87,15 @@ async fn run(opt: config::Opt) -> Result<()> {
     // };
 
     // 用于rpc
-    let (endpoint_pools, setup_type) = EndpointServerPools::from_volumes(opt.address.clone().as_str(), opt.volumes.clone())?;
+    let (endpoint_pools, setup_type) = EndpointServerPools::from_volumes(opt.address.clone().as_str(), opt.volumes.clone())
+        .map_err(|err| Error::from_string(err.to_string()))?;
 
     update_erasure_type(setup_type).await;
 
     // 初始化本地磁盘
-    init_local_disks(endpoint_pools.clone()).await?;
+    init_local_disks(endpoint_pools.clone())
+        .await
+        .map_err(|err| Error::from_string(err.to_string()))?;
 
     // Setup S3 service
     // 本项目使用s3s库来实现s3服务
@@ -177,7 +180,9 @@ async fn run(opt: config::Opt) -> Result<()> {
 
     warn!(" init store");
     // init store
-    ECStore::new(opt.address.clone(), endpoint_pools.clone()).await?;
+    ECStore::new(opt.address.clone(), endpoint_pools.clone())
+        .await
+        .map_err(|err| Error::from_string(err.to_string()))?;
     warn!(" init store success!");
 
     tokio::select! {