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

chore(ci): update error format ratchet baseline

Browse Source 
Co-Authored-By: heihutu <heihutu@gmail.com>

Co-Authored-By: zhi22915 <qiuzgang@gmail.com>
This commit is contained in:
houseme
2026-09-07 19:14:46 +08:00
parent a18d4152e6
commit b5a05bd740
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/core/pools.rs
+11 -10
View File
@@ -5228,7 +5228,7 @@ where
R: Into<PoolMetaReplicaRead>,
{
let replicas = replicas.into_iter().map(Into::into).collect::<Vec<_>>();
if let Some(err) = pool_meta_replica_read_failure(&replicas) {
if let Some(err) = pool_meta_replica_read_failure(&replicas, "pool_read") {
return Err(err);
}
match select_pool_meta_replica_reads(replicas) {
@@ -5248,13 +5248,14 @@ fn block_pool_meta_validation(write_state: &mut PoolMetaWriteState, err: Error,
Error::other(context)
}
fn pool_meta_replica_read_failure(replicas: &[PoolMetaReplicaRead]) -> Option<Error> {
fn pool_meta_replica_read_failure(replicas: &[PoolMetaReplicaRead], operation: &str) -> Option<Error> {
replicas.iter().find_map(|read| match &read.replica {
PoolMetaReplica::Unreadable(source) => Some(Error::other(pool_metadata_error(
crate::error::PoolMetadataFailure::ReadUnavailable,
"pool_read",
Some(Arc::clone(source)),
))),
PoolMetaReplica::Unreadable(source) => {
let mut context =
pool_metadata_error(crate::error::PoolMetadataFailure::ReadUnavailable, "pool_read", Some(Arc::clone(source)));
context.operation = operation.to_owned();
Some(Error::other(context))
}
_ => None,
})
}
@@ -5268,7 +5269,7 @@ where
R: Into<PoolMetaReplicaRead>,
{
let replicas = replicas.into_iter().map(Into::into).collect::<Vec<_>>();
if let Some(err) = pool_meta_replica_read_failure(&replicas) {
if let Some(err) = pool_meta_replica_read_failure(&replicas, operation) {
return Err(err);
}
let selection = select_pool_meta_replica_reads(replicas)?;
@@ -6349,7 +6350,7 @@ where
write_state.observe_identity(&identity)?;
}
let reads = read_pool_meta_replicas(pools, true).await;
if let Some(err) = pool_meta_replica_read_failure(&reads) {
if let Some(err) = pool_meta_replica_read_failure(&reads, "pool metadata transaction recovery") {
return Err(err);
}
if reads
@@ -6771,7 +6772,7 @@ impl PoolMeta {
write_state.observe_identity(&identity)?;
}
let reads = read_pool_meta_replicas(pools, true).await;
if let Some(err) = pool_meta_replica_read_failure(&reads) {
if let Some(err) = pool_meta_replica_read_failure(&reads, "pool metadata load") {
write_state.block_with_context(pool_metadata_error(
crate::error::PoolMetadataFailure::RecoveryRequired,
"startup_read",
crates/ecstore/src/store/heal.rs
+12 -7
View File
@@ -2353,14 +2353,19 @@ mod tests {
.await
.expect("quorum boundary heal should return a mapped result");
*store.pools[0].disk_set[0].disks.write().await = original_quorum_disks;
let quorum_err_text = quorum_err.as_ref().map(ToString::to_string);
assert!(
quorum_err_text.as_deref().is_some_and(|err| {
err.contains("target capacity admission failed")
&& err.contains("pool metadata update cannot overwrite an unreadable replica")
}),
"heal must fail closed when capacity admission cannot verify pool metadata, got {quorum_err:?}"
let quorum_err = quorum_err
.as_ref()
.expect("heal must fail closed when capacity admission cannot verify pool metadata");
let quorum_failure = quorum_err
.pool_metadata_failure()
.expect("capacity admission failure should preserve typed pool metadata context");
assert_eq!(
quorum_failure.kind,
crate::error::PoolMetadataFailure::ReadUnavailable,
"read-only capacity admission failure must remain retryable"
);
assert_eq!(quorum_failure.operation, "target capacity admission failed");
assert_eq!(quorum_failure.phase, "pool_read");
assert!(
store.pool_meta_writes_ready().await,
"read-only capacity admission failure must not latch the pool metadata writer"