gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-22 20:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(rebalance): preserve access-denied delete errors

Browse Source
This commit is contained in:
overtrue
2026-08-22 19:20:11 +08:00
parent 657835f12c
commit 7b7dcfaaf8
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/store/rebalance/support.rs
+29 -2
View File
@@ -73,7 +73,7 @@ pub(super) fn resolve_rebalance_delete_from_all_pools_result(
object: &str, object: &str,
) -> Result<ObjectInfo> { ) -> Result<ObjectInfo> {
result.map_err(|err| { result.map_err(|err| {
if err == Error::PreconditionFailed { if matches!(&err, Error::PreconditionFailed | Error::PrefixAccessDenied(_, _)) {
err err
} else { } else {
Error::other(format!("failed to delete rebalance source object {bucket}/{object}: {err}")) Error::other(format!("failed to delete rebalance source object {bucket}/{object}: {err}"))
@@ -86,7 +86,7 @@ fn is_ignorable_rebalance_delete_error(err: &Error) -> bool {
} }
fn rebalance_delete_pool_error(pool_idx: usize, bucket: &str, object: &str, err: Error) -> Error { fn rebalance_delete_pool_error(pool_idx: usize, bucket: &str, object: &str, err: Error) -> Error {
if err == Error::PreconditionFailed { if matches!(&err, Error::PreconditionFailed | Error::PrefixAccessDenied(_, _)) {
err err
} else { } else {
Error::other(format!("pool {pool_idx} delete failed for {bucket}/{object}: {err}")) Error::other(format!("pool {pool_idx} delete failed for {bucket}/{object}: {err}"))
@@ -191,6 +191,18 @@ mod tests {
assert_eq!(err, Error::PreconditionFailed); assert_eq!(err, Error::PreconditionFailed);
} }
#[test]
fn rebalance_delete_result_preserves_prefix_access_denied() {
let err = resolve_rebalance_delete_from_all_pools_result(
Err(Error::PrefixAccessDenied("bucket".to_owned(), "object".to_owned())),
"bucket",
"object",
)
.expect_err("prefix access denial should remain structured");
assert_eq!(err, Error::PrefixAccessDenied("bucket".to_owned(), "object".to_owned()));
}
#[test] #[test]
fn rebalance_delete_pool_result_preserves_precondition_failed() { fn rebalance_delete_pool_result_preserves_precondition_failed() {
let err = resolve_rebalance_delete_from_all_pools_results( let err = resolve_rebalance_delete_from_all_pools_results(
@@ -205,4 +217,19 @@ mod tests {
assert_eq!(err, Error::PreconditionFailed); assert_eq!(err, Error::PreconditionFailed);
} }
#[test]
fn rebalance_delete_pool_result_preserves_prefix_access_denied() {
let err = resolve_rebalance_delete_from_all_pools_results(
vec![RebalanceDeletePoolResult {
pool_idx: 0,
result: Err(Error::PrefixAccessDenied("bucket".to_owned(), "object".to_owned())),
}],
"bucket",
"object",
)
.expect_err("prefix access denial should remain structured");
assert_eq!(err, Error::PrefixAccessDenied("bucket".to_owned(), "object".to_owned()));
}
} }