gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-10 07:06:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: revert standalone #2351 artifacts (phase 5) (#2535)

Browse Source
This commit is contained in:
安正超
2026-04-14 22:35:05 +08:00
committed by GitHub
parent db8ef63674
commit 68d3dba9fc
20 changed files with 138 additions and 1681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/error.rs
+15 -13
View File
@@ -257,10 +257,23 @@ impl From<StorageError> for ApiError {
impl From<std::io::Error> for ApiError {
fn from(err: std::io::Error) -> Self {
// Check if the error is a ChecksumMismatch (BadDigest)
// Check if the inner error is a StorageError (e.g. InvalidRangeSpec wrapped by object-io)
if let Some(inner) = err.get_ref() {
if let Some(storage_error) = inner.downcast_ref::<StorageError>() {
return storage_error.clone().into();
let code = match storage_error {
StorageError::InvalidRangeSpec(_) => S3ErrorCode::InvalidRange,
_ => S3ErrorCode::InternalError,
};
let message = if code == S3ErrorCode::InternalError {
storage_error.to_string()
} else {
ApiError::error_code_to_message(&code)
};
return ApiError {
code,
message,
source: Some(Box::new(err)),
};
}
if inner.downcast_ref::<rustfs_rio::ChecksumMismatch>().is_some() {
return ApiError {
@@ -555,15 +568,4 @@ mod tests {
// This is expected because ApiError is not a typical Error implementation
assert!(error.source().is_none());
}
#[test]
fn test_api_error_from_io_error_unwraps_invalid_range_storage_error() {
let io_error = std::io::Error::from(StorageError::InvalidRangeSpec("range invalid".to_string()));
let api_error: ApiError = io_error.into();
assert_eq!(api_error.code, S3ErrorCode::InvalidRange);
assert_eq!(api_error.message, ApiError::error_code_to_message(&S3ErrorCode::InvalidRange));
assert!(api_error.source.is_some());
}
}