gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-13 16:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ecstore update ec/disk/error

Browse Source
This commit is contained in:
weisd
2025-06-04 14:26:46 +08:00
committed by weisd
parent 7fe0cc74d2
commit 9384b831ec
102 changed files with 18806 additions and 4864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/grpc.rs
+25 -25
View File
@@ -7,6 +7,7 @@ use ecstore::{
disk::{
DeleteOptions, DiskAPI, DiskInfoOptions, DiskStore, FileInfoVersions, ReadMultipleReq, ReadOptions, UpdateMetadataOpts,
},
error::StorageError,
heal::{
data_usage_cache::DataUsageCache,
heal_commands::{get_local_background_heal_status, HealOpts},
@@ -16,7 +17,6 @@ use ecstore::{
peer::{LocalPeerS3Client, PeerS3Client},
store::{all_local_disk_path, find_local_disk},
store_api::{BucketOptions, DeleteBucketOptions, FileInfo, MakeBucketOptions, StorageAPI},
store_err::StorageError,
utils::err_to_proto_err,
};
use futures::{Stream, StreamExt};
@@ -295,7 +295,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(ReadAllResponse {
success: false,
data: Vec::new(),
error: Some(err_to_proto_err(&err, &format!("read all failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -320,7 +320,7 @@ impl Node for NodeService {
})),
Err(err) => Ok(tonic::Response::new(WriteAllResponse {
success: false,
error: Some(err_to_proto_err(&err, &format!("write all failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -360,7 +360,7 @@ impl Node for NodeService {
})),
Err(err) => Ok(tonic::Response::new(DeleteResponse {
success: false,
error: Some(err_to_proto_err(&err, &format!("delete failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -418,7 +418,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(VerifyFileResponse {
success: false,
check_parts_resp: "".to_string(),
error: Some(err_to_proto_err(&err, &format!("verify file failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -477,7 +477,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(CheckPartsResponse {
success: false,
check_parts_resp: "".to_string(),
error: Some(err_to_proto_err(&err, &format!("check parts failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -511,7 +511,7 @@ impl Node for NodeService {
})),
Err(err) => Ok(tonic::Response::new(RenamePartResponse {
success: false,
error: Some(err_to_proto_err(&err, &format!("rename part failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -538,7 +538,7 @@ impl Node for NodeService {
})),
Err(err) => Ok(tonic::Response::new(RenameFileResponse {
success: false,
error: Some(err_to_proto_err(&err, &format!("rename file failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -805,7 +805,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(ListDirResponse {
success: false,
volumes: Vec::new(),
error: Some(err_to_proto_err(&err, &format!("list dir failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -937,7 +937,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(RenameDataResponse {
success: false,
rename_data_resp: String::new(),
error: Some(err_to_proto_err(&err, &format!("rename data failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -962,7 +962,7 @@ impl Node for NodeService {
})),
Err(err) => Ok(tonic::Response::new(MakeVolumesResponse {
success: false,
error: Some(err_to_proto_err(&err, &format!("make volume failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -986,7 +986,7 @@ impl Node for NodeService {
})),
Err(err) => Ok(tonic::Response::new(MakeVolumeResponse {
success: false,
error: Some(err_to_proto_err(&err, &format!("make volume failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1018,7 +1018,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(ListVolumesResponse {
success: false,
volume_infos: Vec::new(),
error: Some(err_to_proto_err(&err, &format!("list volume failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1055,7 +1055,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(StatVolumeResponse {
success: false,
volume_info: String::new(),
error: Some(err_to_proto_err(&err, &format!("state volume failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1080,7 +1080,7 @@ impl Node for NodeService {
})),
Err(err) => Ok(tonic::Response::new(DeletePathsResponse {
success: false,
error: Some(err_to_proto_err(&err, &format!("delte paths failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1137,7 +1137,7 @@ impl Node for NodeService {
})),
Err(err) => Ok(tonic::Response::new(UpdateMetadataResponse {
success: false,
error: Some(err_to_proto_err(&err, &format!("update metadata failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1177,7 +1177,7 @@ impl Node for NodeService {
})),
Err(err) => Ok(tonic::Response::new(WriteMetadataResponse {
success: false,
error: Some(err_to_proto_err(&err, &format!("write metadata failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1233,7 +1233,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(ReadVersionResponse {
success: false,
file_info: String::new(),
error: Some(err_to_proto_err(&err, &format!("read version failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1270,7 +1270,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(ReadXlResponse {
success: false,
raw_file_info: String::new(),
error: Some(err_to_proto_err(&err, &format!("read xl failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1344,7 +1344,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(DeleteVersionResponse {
success: false,
raw_file_info: "".to_string(),
error: Some(err_to_proto_err(&err, &format!("read version failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1418,7 +1418,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(DeleteVersionsResponse {
success: false,
errors: Vec::new(),
error: Some(err_to_proto_err(&err, &format!("delete version failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1469,7 +1469,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(ReadMultipleResponse {
success: false,
read_multiple_resps: Vec::new(),
error: Some(err_to_proto_err(&err, &format!("read multiple failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1494,7 +1494,7 @@ impl Node for NodeService {
})),
Err(err) => Ok(tonic::Response::new(DeleteVolumeResponse {
success: false,
error: Some(err_to_proto_err(&err, &format!("delete volume failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1547,7 +1547,7 @@ impl Node for NodeService {
Err(err) => Ok(tonic::Response::new(DiskInfoResponse {
success: false,
disk_info: "".to_string(),
error: Some(err_to_proto_err(&err, &format!("disk info failed: {}", err))),
error: Some(err.into()),
})),
}
} else {
@@ -1634,7 +1634,7 @@ impl Node for NodeService {
success: false,
update: "".to_string(),
data_usage_cache: "".to_string(),
error: Some(err_to_proto_err(&err, &format!("scanner failed: {}", err))),
error: Some(err.into()),
}))
.await
.expect("working rx");
rustfs/src/storage/error.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use common::error::Error;
use ecstore::{disk::error::is_err_file_not_found, store_err::StorageError};
use ecstore::{disk::error::is_err_file_not_found, error::StorageError};
use s3s::{s3_error, S3Error, S3ErrorCode};
pub fn to_s3_error(err: Error) -> S3Error {
if let Some(storage_err) = err.downcast_ref::<StorageError>() {
rustfs/src/storage/options.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use common::error::{Error, Result};
use ecstore::bucket::versioning_sys::BucketVersioningSys;
use ecstore::store_api::ObjectOptions;
use ecstore::store_err::StorageError;
use ecstore::error::StorageError;
use ecstore::utils::path::is_dir_object;
use http::{HeaderMap, HeaderValue};
use lazy_static::lazy_static;