gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-09-07 20:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(ecstore): make store-to-disk error narrowing named and fallible (#6626)

Browse Source 
refactor(ecstore): make store-to-disk error narrowing a named fallible operation

Backlog#1845 step 4. The blanket impl From<StorageError> for DiskError let ? silently push store-only errors (locks, buckets, quotas) across the disk boundary into DiskError::other, where the rendered message fragments reduce_errs quorum buckets. Same story for the blanket From<StorageError> for rustfs_filemeta::Error and its other() catch-all.

Both impls are replaced by named, fallible methods: StorageError::narrow_to_disk() and StorageError::narrow_to_filemeta(). Variants with an identity on the far side map across unchanged - including the two documented lossy collapses (SlowDown -> TooManyOpenFiles, StorageFull -> DiskFull) that the round-trip tests pin - and everything else returns Err(self) so the call site decides what crossing the boundary means. Removing the impls let the compiler enumerate every conversion site; the census that scoped this issue had found 5, the compiler found 33.

Call sites keep their existing behavior: the io identity bridge and the generic sites fold Err into the io-backed other() exactly as the old catch-all did (identity still recoverable by downcast), listing paths use one shared to_filemeta_err helper, and the two sites that relied on the SlowDown collapse now construct DiskError::TooManyOpenFiles directly so the loss is visible where it happens. No behavior change intended anywhere; the io::Error bridge itself is untouched by design.

Ref rustfs/backlog#1845
This commit is contained in:
Zhengchao An
2026-08-26 12:32:37 +08:00
committed by GitHub
parent 1590d9107b
commit aa56d4b847
11 changed files with 155 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/error/conversion_roundtrip_tests.rs
+22 -8
View File
@@ -49,7 +49,7 @@ fn heal_matched_disk_variants() -> Vec<DiskError> {
fn disk_to_storage_to_disk_preserves_heal_matched_variants() {
for disk_err in heal_matched_disk_variants() {
let storage: StorageError = disk_err.clone().into();
let back: DiskError = storage.into();
let back: DiskError = storage.narrow_to_disk().expect("heal-matched variants must narrow");
assert_eq!(back, disk_err, "DiskError → StorageError → DiskError must be identity for {disk_err:?}");
}
}
@@ -63,7 +63,10 @@ fn storage_to_disk_to_storage_preserves_heal_matched_variants() {
StorageError::ErasureWriteQuorum,
];
for storage_err in variants {
let disk: DiskError = storage_err.clone().into();
let disk: DiskError = storage_err
.clone()
.narrow_to_disk()
.expect("heal-matched variants must narrow");
let back: StorageError = disk.into();
assert_eq!(
back, storage_err,
@@ -77,11 +80,11 @@ fn storage_to_disk_to_storage_preserves_heal_matched_variants() {
/// A classifier on the far side of the disk boundary can no longer tell
/// backpressure ("please slow down") apart from fd exhaustion.
///
/// Pinned as-is for backlog#1845; PR4's fallible `narrow_to_disk()` is the
/// planned place to surface this loss explicitly.
/// The fallible `narrow_to_disk()` keeps this collapse as a documented arm;
/// only variants with no disk-layer identity at all narrow to `Err`.
#[test]
fn slowdown_collapses_to_too_many_open_files_across_disk_boundary() {
let disk: DiskError = StorageError::SlowDown.into();
let disk: DiskError = StorageError::SlowDown.narrow_to_disk().expect("SlowDown narrows, lossily");
assert_eq!(disk, DiskError::TooManyOpenFiles);
let back: StorageError = disk.into();
@@ -96,7 +99,9 @@ fn slowdown_collapses_to_too_many_open_files_across_disk_boundary() {
/// and comes back as `DiskFull`.
#[test]
fn storage_full_collapses_to_disk_full_across_disk_boundary() {
let disk: DiskError = StorageError::StorageFull.into();
let disk: DiskError = StorageError::StorageFull
.narrow_to_disk()
.expect("StorageFull narrows, lossily");
assert_eq!(disk, DiskError::DiskFull);
let back: StorageError = disk.into();
@@ -204,7 +209,10 @@ fn storage_to_filemeta_to_storage_preserves_matched_variants() {
StorageError::Unexpected,
];
for storage_err in variants {
let filemeta: rustfs_filemeta::Error = storage_err.clone().into();
let filemeta: rustfs_filemeta::Error = storage_err
.clone()
.narrow_to_filemeta()
.expect("matched variants must narrow");
let back: StorageError = filemeta.into();
assert_eq!(
back, storage_err,
@@ -219,7 +227,13 @@ fn storage_to_filemeta_to_storage_preserves_matched_variants() {
/// recovers identity" property of the by-design bridge stays load-bearing.
#[test]
fn storage_to_filemeta_other_recovers_identity_via_io_bridge() {
let filemeta: rustfs_filemeta::Error = StorageError::SlowDown.into();
// A variant with no filemeta identity narrows to Err; callers that need a
// total conversion fold it into the io-backed other(), and the identity
// bridge recovers the boxed StorageError on the way back.
let refused = StorageError::SlowDown
.narrow_to_filemeta()
.expect_err("SlowDown has no filemeta identity");
let filemeta = rustfs_filemeta::Error::other(refused);
assert!(
matches!(filemeta, rustfs_filemeta::Error::Io(_)),
"unmatched variants fold into the io-backed other()"