move ecsotre/error to common

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 std::{fmt::Display, path::Path};
 use url::{ParseError, Url};

ecstore/src/disk/error.rs

@@ -2,11 +2,9 @@ use std::io::{self, ErrorKind};
 
 use tracing::error;
 
+use crate::quorum::CheckErrorFn;
 use crate::utils::ERROR_TYPE_MASK;
-use crate::{
-    error::{Error, Result},
-    quorum::CheckErrorFn,
-};
+use common::error::{Error, Result};
 
 // DiskError == StorageErr
 #[derive(Debug, thiserror::Error)]

ecstore/src/disk/format.rs

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

ecstore/src/disk/local.rs

@@ -18,7 +18,6 @@ use crate::disk::error::{
 };
 use crate::disk::os::{check_path_length, is_empty_dir};
 use crate::disk::STORAGE_FORMAT_FILE;
-use crate::error::{Error, Result};
 use crate::file_meta::{get_file_info, read_xl_meta_no_data, FileInfoOpts};
 use crate::global::{GLOBAL_IsErasureSD, GLOBAL_RootDiskThreshold};
 use crate::heal::data_scanner::{has_active_rules, scan_data_folder, ScannerItem, ShouldSleepFn, SizeSummary};
@@ -47,6 +46,7 @@ use crate::{
     utils,
 };
 use common::defer;
+use common::error::{Error, Result};
 use path_absolutize::Absolutize;
 use std::collections::{HashMap, HashSet};
 use std::fmt::Debug;

ecstore/src/disk/mod.rs

@@ -16,7 +16,6 @@ pub const STORAGE_FORMAT_FILE_BACKUP: &str = "xl.meta.bkp";
 
 use crate::{
     bucket::{metadata_sys::get_versioning_config, versioning::VersioningApi},
-    error::{Error, Result},
     file_meta::{merge_file_meta_versions, FileMeta, FileMetaShallowVersion, VersionType},
     heal::{
         data_scanner::ShouldSleepFn,
@@ -27,6 +26,7 @@ use crate::{
     store_api::{FileInfo, ObjectInfo, RawFileInfo},
     utils::path::SLASH_SEPARATOR,
 };
+use common::error::{Error, Result};
 use endpoint::Endpoint;
 use error::DiskError;
 use local::LocalDisk;

ecstore/src/disk/os.rs

@@ -3,14 +3,13 @@ use std::{
     path::{Component, Path},
 };
 
-use tokio::fs;
-use tracing::info;
-
 use crate::{
     disk::error::{is_sys_err_not_dir, is_sys_err_path_not_found, os_is_not_exist},
-    error::{Error, Result},
     utils::{self, os::same_disk},
 };
+use common::error::{Error, Result};
+use tokio::fs;
+use tracing::info;
 
 use super::error::{os_err_to_file_err, os_is_exist, DiskError};
 

ecstore/src/disk/remote.rs

@@ -28,7 +28,6 @@ use super::{
 };
 use crate::{
     disk::error::DiskError,
-    error::{Error, Result},
     heal::{
         data_scanner::ShouldSleepFn,
         data_usage_cache::{DataUsageCache, DataUsageEntry},
@@ -41,6 +40,7 @@ use crate::{
     io::{FileReader, FileWriter, HttpFileReader, HttpFileWriter},
     utils::proto_err_to_err,
 };
+use common::error::{Error, Result};
 use protos::proto_gen::node_service::RenamePartRequst;
 
 #[derive(Debug)]