Files
rustfs/crates/ecstore/src/store/rebalance.rs
T
cxymds b0c6c4cbce fix(storage): resolve erasure parity per pool (#4977)
* fix(filemeta): add state-aware file info validation

* fix(filemeta): validate shard arithmetic and delete paths

* fix(ecstore): add fallible erasure construction

* fix(ecstore): resolve storage parity per pool

* fix(storage): report heterogeneous erasure layouts

* fix(admin): publish prepared storage config atomically

* fix(storage): harden per-pool parity boundaries

* fix(storage): address pre-PR validation findings

* test(ci): fix strict-topology validation fixtures

* fix(heal): preserve delete markers during repair

* refactor(filemeta): drop unused ValidatedFileInfo witness

ValidatedFileInfo wrapped an unread `_file_info` reference alongside an `Option<ValidatedErasureLayout>`, but only the layout was ever consumed. Return the layout directly from `FileInfo::validate` so the sole production consumer (`LocalDisk::check_parts`) and the two unit tests read it without the extra witness type and lifetime.

No behavior change.

* fix(filemeta): keep compressed and MinIO-migrated tiered objects readable

The new decode-path validation rejected several legitimate on-disk shapes that older RustFS and MinIO-migrated data carry, turning readable objects into FileCorrupt:

- Compressed objects written with an unknown upload size persist a negative per-part actual_size (the documented "unknown size" sentinel that ObjectInfo::get_actual_size already tolerates). validate_collection_contents rejected it via usize::try_from; now a negative actual_size skips shard validation and only real, non-negative sizes are checked.
- MinIO-migrated objects transitioned to a versioned remote tier store the tier version id as a UUID string, not 16 raw bytes. MetaObject::into_fileinfo returned FileCorrupt (main tolerated it as None), making all versions of the object unreadable; MetaDeleteMarker free-version records took a Some(nil) sentinel path with the same effect, which also breaks free-version expiry (remote-tier leak). Both now decode through a shared transitioned_version_id_from_meta_sys helper: 16 raw bytes or a UUID string are accepted, anything else is tolerated as None instead of failing the read.

Regression tests updated to assert the readable/compat behavior, with new tests covering MinIO string-form recovery.

* fix(scanner): build the delete-marker test fixture without erasure geometry

get_size_counts_delete_markers_separately_from_versions built its delete marker with `FileInfo::new(object, 1, 1)`, which attaches erasure geometry (data=1/parity=1/distribution). This PR classifies versions by shape via `is_storage_delete_marker()` (no geometry) rather than the raw `deleted` flag, so a geometry-bearing "delete marker" is correctly serialized as a purge-pending payload Object and counted as a version — CI saw summary.versions=3, expected 2.

Real delete markers carry no erasure geometry (delete paths build them as `FileInfo { deleted: true, ..Default::default() }`), so construct the fixture the same way. It then classifies as a storage delete marker and the counts (versions=2, delete_markers=1) hold. This keeps the PR's more-correct classification, which prevents a purge-pending object's geometry from being dropped when serialized as a bare delete marker.

* docs(changelog): note per-pool parity fix and storage-class startup upgrade caveat

Records the #4801 per-pool erasure parity fix under Fixed, and documents the upgrade behavior where a persisted storage class that a small or heterogeneous pool cannot satisfy now fails startup — with the RUSTFS_STORAGE_CLASS_STANDARD recovery steps. Docs-only; covers R4 from the on-disk compatibility audit.

* fix(heal): report parity from erasure geometry, not is_valid()

heal_object set HealResultItem.parity_blocks via `if lfi.is_valid()`, which was missed by the migration of the other quorum/metadata predicates. With the new `is_valid()` semantics (full payload validation; delete markers now return false), a delete marker or a geometry-bearing version with a benign collection quirk would misreport parity as the pool default instead of its own. Use `has_valid_erasure_geometry()` — the narrow "does this carry erasure geometry" predicate the rest of the migration uses — so reporting matches the object's actual layout. Reporting-only; no data-path change.

* fix(filemeta): do not silently serialize a non-canonical deleted FileInfo as an Object

`From<FileInfo> for FileMetaVersion` classifies by `is_storage_delete_marker()` (shape), which correctly routes canonical delete markers to Delete and purge-pending payloads (deleted=true with real erasure geometry) to Object. But a `deleted` FileInfo that is neither a canonical marker nor a valid erasure payload would silently serialize as a zero-geometry MetaObject that later fails `validate_for_metadata_read`. Write paths validate first (`validate_for_erasure_write` / `validate_for_metadata_read`), so this is a caller bug; `From` is infallible, so surface it with a structured `warn!` on the malformed branch instead of writing corrupt metadata silently. Legitimate purge-pending objects (valid geometry) are unaffected — the guard only fires for `deleted && !has_valid_erasure_geometry()`.

* test(filemeta): assert real historical xl.meta versions pass metadata-read validation

Empirical companion to the code-reasoned decode-tolerance invariants (docs/architecture/erasure-coding.md §11) and the rolling-upgrade / MinIO-migration compatibility concern: the tightened `validate_for_metadata_read` runs on every local disk read and peer-RPC-decoded FileInfo, so it must accept every version of real historically-written xl.meta, never reject it as FileCorrupt.

Loads five real fixtures — MinIO small-inline, MinIO versioned (two object versions + a delete marker), MinIO large multipart, a legacy V1 (xl.json-derived) object, and a legacy meta_ver 2 object — decodes every version with parts materialized, and asserts validate_for_metadata_read() is Ok for each. Reverting the tolerant handling (delete-marker shape, legacy per-part checksums, string/short transitioned-versionID, negative actual_size) turns this red.

* fix(ci): remove duplicate storage test re-exports

---------

Co-authored-by: overtrue <anzhengchao@gmail.com>
2026-07-19 21:52:31 +08:00

1209 lines
43 KiB
Rust

// Copyright 2024 RustFS Team
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
use super::*;
use crate::config::storageclass;
use crate::layout::pool_space::{ServerPoolsAvailableSpace, build_server_pools_available_space};
use crate::runtime::sources as runtime_sources;
use crate::storage_api_contracts::{admin::StorageAdminApi, namespace::NamespaceLocking as _, object::ObjectOperations as _};
pub(in crate::store) mod support;
use support::{
LatestObjectInfoCandidate, PoolErr, PoolObjInfo, RebalanceDeletePoolResult, pool_lookup_not_found_error,
rebalance_disk_set_lookup_error, resolve_latest_object_info_candidates, resolve_rebalance_delete_from_all_pools_result,
resolve_rebalance_delete_from_all_pools_results, resolve_store_rebalance_pool_meta_reload_result,
};
#[derive(Debug, Default, Eq, PartialEq)]
struct BackendStorageClassInfo {
standard_sc_data: Vec<usize>,
standard_sc_parities: Vec<usize>,
standard_sc_parity: Option<usize>,
rr_sc_data: Vec<usize>,
rr_sc_parities: Vec<usize>,
rr_sc_parity: Option<usize>,
}
fn resolve_pool_layout(
drives_per_set: &[usize],
mut parity_for_pool: impl FnMut(usize, usize) -> Option<usize>,
) -> Option<(Vec<usize>, Vec<usize>)> {
let mut parities = Vec::with_capacity(drives_per_set.len());
let mut data = Vec::with_capacity(drives_per_set.len());
for (pool_index, &drives) in drives_per_set.iter().enumerate() {
if drives == 0 {
return None;
}
let parity = parity_for_pool(pool_index, drives)?;
let data_drives = drives.checked_sub(parity)?;
if data_drives == 0 || parity > data_drives {
return None;
}
data.push(data_drives);
parities.push(parity);
}
Some((parities, data))
}
fn homogeneous_parity(parities: &[usize]) -> Option<usize> {
let first = *parities.first()?;
parities.iter().all(|&parity| parity == first).then_some(first)
}
fn resolve_complete_pool_layouts(
drives_per_set: &[usize],
standard_parity_for_pool: impl FnMut(usize, usize) -> Option<usize>,
rr_parity_for_pool: impl FnMut(usize, usize) -> Option<usize>,
) -> Option<BackendStorageClassInfo> {
let (standard_sc_parities, standard_sc_data) = resolve_pool_layout(drives_per_set, standard_parity_for_pool)?;
let (rr_sc_parities, rr_sc_data) = resolve_pool_layout(drives_per_set, rr_parity_for_pool)?;
for ((&standard_parity, &rr_parity), &drives) in standard_sc_parities.iter().zip(&rr_sc_parities).zip(drives_per_set) {
storageclass::validate_parity_inner(standard_parity, rr_parity, drives).ok()?;
}
Some(BackendStorageClassInfo {
standard_sc_parity: homogeneous_parity(&standard_sc_parities),
standard_sc_data,
standard_sc_parities,
rr_sc_parity: homogeneous_parity(&rr_sc_parities),
rr_sc_data,
rr_sc_parities,
})
}
fn resolve_backend_storage_class_info(
config: &storageclass::Config,
drives_per_set: &[usize],
default_standard_parities: &[usize],
) -> BackendStorageClassInfo {
if drives_per_set.len() != default_standard_parities.len() {
return BackendStorageClassInfo::default();
}
if !config.is_initialized() {
let Some((standard_sc_parities, standard_sc_data)) =
resolve_pool_layout(drives_per_set, |pool_index, _| default_standard_parities.get(pool_index).copied())
else {
return BackendStorageClassInfo::default();
};
return BackendStorageClassInfo {
standard_sc_parity: homogeneous_parity(&standard_sc_parities),
standard_sc_data,
standard_sc_parities,
..Default::default()
};
}
match (config.parities_for_sc(storageclass::STANDARD), config.parities_for_sc(storageclass::RRS)) {
(Some(standard), Some(rr)) if standard.len() == drives_per_set.len() && rr.len() == drives_per_set.len() => {
resolve_complete_pool_layouts(
drives_per_set,
|pool_index, drives| config.parity_for_pool(storageclass::STANDARD, pool_index, drives),
|pool_index, drives| config.parity_for_pool(storageclass::RRS, pool_index, drives),
)
.unwrap_or_default()
}
(None, None) => {
let Some(standard) = config.get_parity_for_sc(storageclass::STANDARD) else {
return BackendStorageClassInfo::default();
};
let Some(rr) = config.get_parity_for_sc(storageclass::RRS) else {
return BackendStorageClassInfo::default();
};
resolve_complete_pool_layouts(drives_per_set, |_, _| Some(standard), |_, _| Some(rr)).unwrap_or_default()
}
_ => BackendStorageClassInfo::default(),
}
}
fn build_backend_info(
config: &storageclass::Config,
drives_per_set: &[usize],
default_standard_parities: &[usize],
total_sets: &[usize],
) -> rustfs_madmin::BackendInfo {
let storage_class_info = if total_sets.len() == drives_per_set.len() {
resolve_backend_storage_class_info(config, drives_per_set, default_standard_parities)
} else {
BackendStorageClassInfo::default()
};
rustfs_madmin::BackendInfo {
backend_type: rustfs_madmin::BackendByte::Erasure,
online_disks: rustfs_madmin::BackendDisks::new(),
offline_disks: rustfs_madmin::BackendDisks::new(),
standard_sc_data: storage_class_info.standard_sc_data,
standard_sc_parities: storage_class_info.standard_sc_parities,
standard_sc_parity: storage_class_info.standard_sc_parity,
rr_sc_data: storage_class_info.rr_sc_data,
rr_sc_parities: storage_class_info.rr_sc_parities,
rr_sc_parity: storage_class_info.rr_sc_parity,
total_sets: total_sets.to_vec(),
drives_per_set: drives_per_set.to_vec(),
}
}
impl ECStore {
#[instrument(level = "debug", skip(self))]
pub(super) async fn delete_all(&self, bucket: &str, prefix: &str) -> Result<()> {
let mut futures = Vec::new();
for sets in self.pools.iter() {
for set in sets.disk_set.iter() {
futures.push(set.delete_all(bucket, prefix));
// let disks = set.disks.read().await;
// let dd = disks.clone();
// for disk in dd {
// if disk.is_none() {
// continue;
// }
// // let disk = disk.as_ref().expect("operation should succeed").clone();
// // futures.push(disk.delete(
// // bucket,
// // prefix,
// // DeleteOptions {
// // recursive: true,
// // immediate: false,
// // },
// // ));
// }
}
}
let results = join_all(futures).await;
let mut errs = Vec::new();
for res in results {
match res {
Ok(_) => errs.push(None),
Err(e) => errs.push(Some(e)),
}
}
debug!("store delete_all errs {:?}", errs);
Ok(())
}
pub(super) async fn delete_prefix(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<()> {
for pool in self.pools.iter() {
let mut opts = opts.clone();
opts.delete_prefix = true;
pool.delete_object(bucket, object, opts).await?;
}
Ok(())
}
pub(super) async fn get_available_pool_idx(&self, bucket: &str, object: &str, size: i64) -> Option<usize> {
// // Return a random one first
let mut server_pools = self.get_server_pools_available_space(bucket, object, size).await;
server_pools.filter_max_used(100 - (100_f64 * DISK_RESERVE_FRACTION) as u64);
let total = server_pools.total_available();
if total == 0 {
return None;
}
let mut rng = rand::rng();
let random_u64: u64 = rng.random_range(0..total);
let choose = random_u64 % total;
let mut at_total = 0;
for pool in server_pools.iter() {
at_total += pool.available;
if at_total > choose && pool.available > 0 {
return Some(pool.index);
}
}
None
}
pub(super) async fn get_available_pool_idx_excluding(
&self,
bucket: &str,
object: &str,
size: i64,
excluded_pool_idx: usize,
) -> Option<usize> {
let mut server_pools = self.get_server_pools_available_space(bucket, object, size).await;
server_pools.filter_max_used(100 - (100_f64 * DISK_RESERVE_FRACTION) as u64);
if let Some(pool) = server_pools.0.get_mut(excluded_pool_idx) {
pool.available = 0;
}
let total = server_pools.total_available();
if total == 0 {
return None;
}
let mut rng = rand::rng();
let random_u64: u64 = rng.random_range(0..total);
let choose = random_u64 % total;
let mut at_total = 0;
for pool in server_pools.iter() {
at_total += pool.available;
if at_total > choose && pool.available > 0 {
return Some(pool.index);
}
}
None
}
async fn get_server_pools_available_space(&self, bucket: &str, object: &str, size: i64) -> ServerPoolsAvailableSpace {
let mut n_sets = vec![0; self.pools.len()];
let mut infos = vec![Vec::new(); self.pools.len()];
let pool_inputs = join_all(self.pools.iter().enumerate().map(|(idx, pool)| async move {
if self.is_suspended(idx).await || self.is_pool_rebalancing(idx).await {
return (idx, 0, Vec::new());
}
let disks = pool.get_disks_by_key(object).disk_inventory().await;
let disk_infos = get_disk_infos(&disks).await;
(idx, pool.set_count, disk_infos)
}))
.await;
for (idx, set_count, disk_infos) in pool_inputs {
n_sets[idx] = set_count;
infos[idx] = disk_infos;
}
build_server_pools_available_space(bucket, size, &n_sets, &infos).await
}
pub(super) async fn is_suspended(&self, idx: usize) -> bool {
// TODO: LOCK
let pool_meta = self.pool_meta.read().await;
pool_meta.is_suspended(idx)
}
pub(super) async fn get_pool_idx(&self, bucket: &str, object: &str, size: i64) -> Result<usize> {
let idx = match self
.get_pool_idx_existing_with_opts(
bucket,
object,
&ObjectOptions {
skip_decommissioned: true,
skip_rebalancing: true,
..Default::default()
},
)
.await
{
Ok(res) => res,
Err(err) => {
if !is_err_object_not_found(&err) {
return Err(err);
}
if let Some(hit_idx) = self.get_available_pool_idx(bucket, object, size).await {
hit_idx
} else {
return Err(Error::DiskFull);
}
}
};
Ok(idx)
}
pub(super) async fn get_pool_idx_no_lock(&self, bucket: &str, object: &str, size: i64) -> Result<usize> {
let idx = match self.get_pool_idx_existing_no_lock(bucket, object).await {
Ok(res) => res,
Err(err) => {
if !is_err_object_not_found(&err) {
return Err(err);
}
if let Some(idx) = self.get_available_pool_idx(bucket, object, size).await {
idx
} else {
warn!("get_pool_idx_no_lock: disk full {}/{}", bucket, object);
return Err(Error::DiskFull);
}
}
};
Ok(idx)
}
async fn get_pool_idx_existing_no_lock(&self, bucket: &str, object: &str) -> Result<usize> {
self.get_pool_idx_existing_with_opts(
bucket,
object,
&ObjectOptions {
no_lock: true,
skip_decommissioned: true,
skip_rebalancing: true,
..Default::default()
},
)
.await
}
pub(super) async fn get_pool_idx_existing_with_opts(
&self,
bucket: &str,
object: &str,
opts: &ObjectOptions,
) -> Result<usize> {
let (pinfo, _) = self.get_pool_info_existing_with_opts(bucket, object, opts).await?;
Ok(pinfo.index)
}
pub(super) async fn get_pool_info_existing_with_opts(
&self,
bucket: &str,
object: &str,
opts: &ObjectOptions,
) -> Result<(PoolObjInfo, Vec<PoolErr>)> {
self.internal_get_pool_info_existing_with_opts(bucket, object, opts).await
}
async fn internal_get_pool_info_existing_with_opts(
&self,
bucket: &str,
object: &str,
opts: &ObjectOptions,
) -> Result<(PoolObjInfo, Vec<PoolErr>)> {
let mut futures = Vec::new();
for pool in self.pools.iter() {
let mut pool_opts = opts.clone();
if !pool_opts.metadata_chg {
pool_opts.version_id = None;
}
futures.push(async move { pool.get_object_info(bucket, object, &pool_opts).await });
}
let results = join_all(futures).await;
let mut ress = Vec::new();
// join_all preserves the input order
for (i, res) in results.into_iter().enumerate() {
let index = i;
match res {
Ok(r) => {
ress.push(PoolObjInfo {
index,
object_info: r,
err: None,
});
}
Err(e) => {
ress.push(PoolObjInfo {
index,
err: Some(e),
..Default::default()
});
}
}
}
ress.sort_by(|a, b| {
let at = a.object_info.mod_time.unwrap_or(OffsetDateTime::UNIX_EPOCH);
let bt = b.object_info.mod_time.unwrap_or(OffsetDateTime::UNIX_EPOCH);
bt.cmp(&at)
});
let mut def_pool = PoolObjInfo::default();
let mut has_def_pool = false;
for pinfo in ress.iter() {
if opts.skip_decommissioned && self.is_suspended(pinfo.index).await {
continue;
}
if opts.skip_rebalancing && self.is_pool_rebalancing(pinfo.index).await {
continue;
}
if pinfo.err.is_none() {
return Ok((pinfo.clone(), self.pools_with_object(&ress, opts).await));
}
let err = pinfo.err.as_ref().expect("operation should succeed");
if err == &Error::ErasureReadQuorum && !opts.metadata_chg {
return Ok((pinfo.clone(), self.pools_with_object(&ress, opts).await));
}
def_pool = pinfo.clone();
has_def_pool = true;
// https://docs.aws.amazon.com/AmazonS3/latest/userguide/conditional-deletes.html
if is_err_object_not_found(err)
&& let Err(err) = opts.precondition_check(&pinfo.object_info)
{
return Err(err);
}
if !is_err_object_not_found(err) && !is_err_version_not_found(err) {
return Err(err.clone());
}
if pinfo.object_info.delete_marker && !pinfo.object_info.name.is_empty() {
return Ok((pinfo.clone(), Vec::new()));
}
}
if opts.replication_request && opts.delete_marker && has_def_pool {
return Ok((def_pool, Vec::new()));
}
Err(pool_lookup_not_found_error(bucket, object, opts))
}
async fn pools_with_object(&self, pools: &[PoolObjInfo], opts: &ObjectOptions) -> Vec<PoolErr> {
let mut errs = Vec::new();
for pool in pools.iter() {
if opts.skip_decommissioned && self.is_suspended(pool.index).await {
continue;
}
if opts.skip_rebalancing && self.is_pool_rebalancing(pool.index).await {
continue;
}
if let Some(err) = &pool.err {
if err == &Error::ErasureReadQuorum {
errs.push(PoolErr {
index: Some(pool.index),
err: Some(Error::ErasureReadQuorum),
});
}
} else {
errs.push(PoolErr {
index: Some(pool.index),
err: None,
});
}
}
errs
}
pub(super) async fn get_latest_object_info_with_idx(
&self,
bucket: &str,
object: &str,
opts: &ObjectOptions,
) -> Result<(ObjectInfo, usize)> {
let mut futures = Vec::with_capacity(self.pools.len());
for pool in self.pools.iter() {
futures.push(pool.get_object_info(bucket, object, opts));
}
let results = join_all(futures).await;
let mut candidates = Vec::with_capacity(self.pools.len());
for (idx, result) in results.into_iter().enumerate() {
match result {
Ok(res) => {
candidates.push(LatestObjectInfoCandidate {
info: Some(res),
idx,
err: None,
});
}
Err(e) => {
candidates.push(LatestObjectInfoCandidate {
info: None,
idx,
err: Some(e),
});
}
}
}
// Delete markers are returned as latest object infos here. Higher-level
// access paths are responsible for translating them into read/write
// semantics such as object-not-found or method-not-allowed.
resolve_latest_object_info_candidates(candidates, bucket, object, opts)
}
pub(super) async fn delete_object_from_all_pools(
&self,
bucket: &str,
object: &str,
opts: &ObjectOptions,
errs: Vec<PoolErr>,
) -> Result<ObjectInfo> {
let mut results = Vec::with_capacity(errs.len());
for pe in errs.iter() {
if let Some(err) = &pe.err
&& err == &StorageError::ErasureWriteQuorum
{
if let Some(idx) = pe.index {
results.push(RebalanceDeletePoolResult {
pool_idx: idx,
result: Err(StorageError::ErasureWriteQuorum),
});
}
continue;
}
if let Some(idx) = pe.index {
results.push(RebalanceDeletePoolResult {
pool_idx: idx,
result: self.pools[idx].delete_object(bucket, object, opts.clone()).await,
});
}
}
resolve_rebalance_delete_from_all_pools_result(
resolve_rebalance_delete_from_all_pools_results(results, bucket, object),
bucket,
object,
)
}
pub async fn reload_pool_meta(&self) -> Result<()> {
let mut meta = PoolMeta::default();
resolve_store_rebalance_pool_meta_reload_result(
meta.load(self.pools[0].clone(), self.pools.clone()).await,
"reload_pool_meta",
)?;
let mut pool_meta = self.pool_meta.write().await;
*pool_meta = meta;
// *self.pool_meta.write().expect("operation should succeed") = meta;
Ok(())
}
/// Disk information deduplication function
///
/// Use multiple field combinations to ensure uniqueness:
/// - endpoint (node address)
/// - drive_path (mount path)
/// - pool_index (pool index)
/// - set_index (Collection Index)
/// - disk_index (disk index)
pub(crate) fn deduplicate_disks(disks: Vec<rustfs_madmin::Disk>) -> Vec<rustfs_madmin::Disk> {
use std::collections::HashMap;
use std::collections::hash_map::Entry;
let mut unique_disks: HashMap<String, rustfs_madmin::Disk> = HashMap::new();
let mut duplicate_count = 0;
for disk in disks {
let key = format!(
"{}|{}|p{}s{}d{}",
disk.endpoint, disk.drive_path, disk.pool_index, disk.set_index, disk.disk_index
);
match unique_disks.entry(key) {
Entry::Vacant(entry) => {
entry.insert(disk);
}
Entry::Occupied(_) => {
duplicate_count += 1;
}
}
}
if duplicate_count > 0 {
debug!("Deduplicated {} duplicate disk entries", duplicate_count);
}
unique_disks.into_values().collect()
}
#[instrument(skip(self))]
pub(super) async fn handle_new_ns_lock(&self, bucket: &str, object: &str) -> Result<NamespaceLockWrapper> {
self.pools[0].new_ns_lock(bucket, object).await
}
#[instrument(skip(self))]
pub(super) async fn handle_backend_info(&self) -> rustfs_madmin::BackendInfo {
let drives_per_set = StorageAdminApi::set_drive_counts(self);
let default_standard_parities = self.pools.iter().map(|pool| pool.default_parity_count).collect::<Vec<_>>();
let storage_class = runtime_sources::storage_class_config_snapshot();
let total_sets = self.pools.iter().map(|pool| pool.set_count).collect::<Vec<_>>();
build_backend_info(&storage_class, &drives_per_set, &default_standard_parities, &total_sets)
}
#[instrument(skip(self))]
pub(super) async fn handle_storage_info(&self) -> rustfs_madmin::StorageInfo {
let Some(notification_sy) = runtime_sources::notification_sys() else {
return rustfs_madmin::StorageInfo::default();
};
let mut info = notification_sy.storage_info(self).await;
// 🔧 Defensive deduplication: This protection mechanism is retained even if the upstream is fixed
let original_count = info.disks.len();
info.disks = Self::deduplicate_disks(info.disks);
let final_count = info.disks.len();
if original_count != final_count {
warn!(
"Storage info deduplication: removed {} duplicate disk entries ({} -> {})",
original_count - final_count,
original_count,
final_count
);
}
info
}
#[instrument(skip(self))]
pub(super) async fn handle_local_storage_info(&self) -> rustfs_madmin::StorageInfo {
let mut futures = Vec::with_capacity(self.pools.len());
for pool in self.pools.iter() {
futures.push(pool.local_storage_info_snapshot())
}
let results = join_all(futures).await;
let mut disks = Vec::new();
for res in results.into_iter() {
disks.extend_from_slice(&res.disks);
}
// 🔧 Defensive deduplication: when aggregating disks from all pools, drop duplicate
// entries that may be reported multiple times by backends; this extra layer is kept
// even if the upstream reporting is later fixed.
let original_count = disks.len();
disks = Self::deduplicate_disks(disks);
if original_count != disks.len() {
warn!("Local storage info deduplication: {} -> {}", original_count, disks.len());
}
let backend = StorageAdminApi::backend_info(self).await;
rustfs_madmin::StorageInfo { backend, disks }
}
#[instrument(skip(self))]
pub(super) async fn handle_get_disks(&self, pool_idx: usize, set_idx: usize) -> Result<Vec<Option<DiskStore>>> {
if pool_idx < self.pools.len() && set_idx < self.pools[pool_idx].disk_set.len() {
Ok(self.pools[pool_idx].disk_set[set_idx].disk_inventory().await)
} else {
Err(rebalance_disk_set_lookup_error(pool_idx, set_idx, self.pools.len()))
}
}
#[instrument(skip(self))]
pub(super) fn handle_set_drive_counts(&self) -> Vec<usize> {
let mut counts = vec![0; self.pools.len()];
for (i, pool) in self.pools.iter().enumerate() {
counts[i] = pool.set_drive_count();
}
counts
}
#[instrument(skip(self))]
pub(super) async fn handle_get_pool_and_set(&self, id: &str) -> Result<(Option<usize>, Option<usize>, Option<usize>)> {
for (pool_idx, pool) in self.pools.iter().enumerate() {
for (set_idx, set) in pool.format.erasure.sets.iter().enumerate() {
for (disk_idx, disk_id) in set.iter().enumerate() {
if disk_id.to_string() == id {
return Ok((Some(pool_idx), Some(set_idx), Some(disk_idx)));
}
}
}
}
Err(Error::DiskNotFound)
}
}
#[cfg(test)]
mod tests {
use super::*;
use crate::config::storageclass::{CLASS_RRS, CLASS_STANDARD, lookup_config_for_pools_without_env};
use arc_swap::ArcSwap;
use rustfs_config::server_config::KVS;
use std::sync::Arc;
fn assert_backend_layout_empty(info: &rustfs_madmin::BackendInfo) {
assert!(info.standard_sc_parities.is_empty());
assert!(info.standard_sc_data.is_empty());
assert_eq!(info.standard_sc_parity, None);
assert!(info.rr_sc_parities.is_empty());
assert!(info.rr_sc_data.is_empty());
assert_eq!(info.rr_sc_parity, None);
}
#[test]
fn build_backend_info_reports_heterogeneous_automatic_config_in_pool_order() {
let config = lookup_config_for_pools_without_env(&KVS::new(), &[4, 2]).expect("automatic storage class should resolve");
let info = build_backend_info(&config, &[4, 2], &[2, 1], &[7, 3]);
assert!(matches!(info.backend_type, rustfs_madmin::BackendByte::Erasure));
assert_eq!(info.standard_sc_parities, vec![2, 1]);
assert_eq!(info.standard_sc_data, vec![2, 1]);
assert_eq!(info.standard_sc_parity, None);
assert_eq!(info.rr_sc_parities, vec![1, 1]);
assert_eq!(info.rr_sc_data, vec![3, 1]);
assert_eq!(info.rr_sc_parity, Some(1));
assert_eq!(info.drives_per_set, vec![4, 2]);
assert_eq!(info.total_sets, vec![7, 3]);
}
#[test]
fn build_backend_info_keeps_truthful_homogeneous_scalar() {
let mut kvs = KVS::new();
kvs.insert(CLASS_STANDARD.to_string(), "EC:2".to_string());
let config =
lookup_config_for_pools_without_env(&kvs, &[4, 6]).expect("explicit storage class should resolve for every pool");
let info = build_backend_info(&config, &[4, 6], &[2, 3], &[1, 1]);
assert_eq!(info.standard_sc_parities, vec![2, 2]);
assert_eq!(info.standard_sc_data, vec![2, 4]);
assert_eq!(info.standard_sc_parity, Some(2));
assert_eq!(info.rr_sc_parities, vec![1, 1]);
assert_eq!(info.rr_sc_data, vec![3, 5]);
assert_eq!(info.rr_sc_parity, Some(1));
}
#[test]
fn build_backend_info_reports_single_disk_pool_without_inventing_parity() {
let config = lookup_config_for_pools_without_env(&KVS::new(), &[4, 1]).expect("single disk pool should resolve");
let info = build_backend_info(&config, &[4, 1], &[2, 0], &[1, 1]);
assert_eq!(info.standard_sc_parities, vec![2, 0]);
assert_eq!(info.standard_sc_data, vec![2, 1]);
assert_eq!(info.standard_sc_parity, None);
assert_eq!(info.rr_sc_parities, vec![1, 0]);
assert_eq!(info.rr_sc_data, vec![3, 1]);
assert_eq!(info.rr_sc_parity, None);
}
#[test]
fn build_backend_info_uses_pool_defaults_only_when_truly_uninitialized() {
let info = build_backend_info(&Default::default(), &[4, 2], &[1, 0], &[1, 1]);
assert_eq!(info.standard_sc_parities, vec![1, 0]);
assert_eq!(info.standard_sc_data, vec![3, 2]);
assert_eq!(info.standard_sc_parity, None);
assert!(info.rr_sc_parities.is_empty());
assert!(info.rr_sc_data.is_empty());
assert_eq!(info.rr_sc_parity, None);
}
#[test]
fn build_backend_info_fails_closed_on_initialized_snapshot_mismatch() {
let config = lookup_config_for_pools_without_env(&KVS::new(), &[4, 2]).expect("automatic storage class should resolve");
let info = build_backend_info(&config, &[4, 6], &[1, 2], &[1, 1]);
assert_backend_layout_empty(&info);
assert_eq!(info.drives_per_set, vec![4, 6]);
assert_eq!(info.total_sets, vec![1, 1]);
}
#[test]
fn build_backend_info_expands_valid_legacy_scalar_snapshot() {
let mut kvs = KVS::new();
kvs.insert(CLASS_STANDARD.to_string(), "EC:2".to_string());
kvs.insert(CLASS_RRS.to_string(), "EC:1".to_string());
let current =
lookup_config_for_pools_without_env(&kvs, &[4, 6]).expect("distinct legacy scalars should resolve for every pool");
let encoded = serde_json::to_string(&current).expect("config should serialize");
let legacy: storageclass::Config = serde_json::from_str(&encoded).expect("legacy scalar config should deserialize");
let info = build_backend_info(&legacy, &[4, 6], &[2, 3], &[1, 1]);
assert_eq!(info.standard_sc_parities, vec![2, 2]);
assert_eq!(info.standard_sc_data, vec![2, 4]);
assert_eq!(info.standard_sc_parity, Some(2));
assert_eq!(info.rr_sc_parities, vec![1, 1]);
assert_eq!(info.rr_sc_data, vec![3, 5]);
assert_eq!(info.rr_sc_parity, Some(1));
}
#[test]
fn build_backend_info_rejects_legacy_scalar_invalid_for_later_pool() {
let current = lookup_config_for_pools_without_env(&KVS::new(), &[4, 2]).expect("automatic config should resolve");
let encoded = serde_json::to_string(&current).expect("config should serialize");
let legacy: storageclass::Config = serde_json::from_str(&encoded).expect("legacy scalar config should deserialize");
let info = build_backend_info(&legacy, &[4, 2], &[2, 1], &[1, 1]);
assert_backend_layout_empty(&info);
}
#[test]
fn build_backend_info_never_reports_invalid_geometry() {
let config = storageclass::Config::default();
assert_backend_layout_empty(&build_backend_info(&config, &[4, 2], &[5, 1], &[1, 1]));
assert_backend_layout_empty(&build_backend_info(&config, &[0], &[0], &[1]));
assert_backend_layout_empty(&build_backend_info(&config, &[4], &[3], &[1]));
}
#[test]
fn build_backend_info_rejects_mismatched_topology_lengths() {
let config = lookup_config_for_pools_without_env(&KVS::new(), &[4, 2]).expect("automatic storage class should resolve");
assert_backend_layout_empty(&build_backend_info(&config, &[4, 2], &[2], &[1, 1]));
assert_backend_layout_empty(&build_backend_info(&config, &[4, 2], &[2, 1], &[1]));
let empty = build_backend_info(&Default::default(), &[], &[], &[]);
assert_backend_layout_empty(&empty);
assert!(empty.drives_per_set.is_empty());
assert!(empty.total_sets.is_empty());
}
#[test]
fn build_backend_info_uses_one_complete_arc_swap_snapshot() {
let old = lookup_config_for_pools_without_env(&KVS::new(), &[4, 2]).expect("old config should resolve");
let mut new_kvs = KVS::new();
new_kvs.insert(CLASS_STANDARD.to_string(), "EC:1".to_string());
let new = lookup_config_for_pools_without_env(&new_kvs, &[4, 2]).expect("new config should resolve");
let snapshots = ArcSwap::from_pointee(old);
let held_old = snapshots.load_full();
snapshots.store(Arc::new(new));
let old_info = build_backend_info(&held_old, &[4, 2], &[2, 1], &[1, 1]);
let new_info = build_backend_info(&snapshots.load_full(), &[4, 2], &[2, 1], &[1, 1]);
assert_eq!(old_info.standard_sc_parities, vec![2, 1]);
assert_eq!(old_info.standard_sc_data, vec![2, 1]);
assert_eq!(old_info.standard_sc_parity, None);
assert_eq!(old_info.rr_sc_parities, vec![1, 1]);
assert_eq!(new_info.standard_sc_parities, vec![1, 1]);
assert_eq!(new_info.standard_sc_data, vec![3, 1]);
assert_eq!(new_info.standard_sc_parity, Some(1));
assert_eq!(new_info.rr_sc_parities, vec![1, 1]);
}
fn object_info_with_mod_time(unix_ts: i64, delete_marker: bool) -> ObjectInfo {
ObjectInfo {
mod_time: Some(OffsetDateTime::from_unix_timestamp(unix_ts).expect("operation should succeed")),
delete_marker,
..Default::default()
}
}
#[test]
fn resolve_latest_object_info_candidates_returns_latest_delete_marker() {
let candidates = vec![
LatestObjectInfoCandidate {
info: Some(object_info_with_mod_time(10, false)),
idx: 0,
err: None,
},
LatestObjectInfoCandidate {
info: Some(object_info_with_mod_time(20, true)),
idx: 1,
err: None,
},
];
let (info, idx) = resolve_latest_object_info_candidates(candidates, "bucket", "object", &ObjectOptions::default())
.expect("operation should succeed");
assert_eq!(idx, 1);
assert!(info.delete_marker);
}
#[test]
fn resolve_latest_object_info_candidates_prefers_higher_pool_idx_on_equal_mod_time() {
let candidates = vec![
LatestObjectInfoCandidate {
info: Some(object_info_with_mod_time(10, false)),
idx: 0,
err: None,
},
LatestObjectInfoCandidate {
info: Some(object_info_with_mod_time(10, false)),
idx: 1,
err: None,
},
];
let (_, idx) = resolve_latest_object_info_candidates(candidates, "bucket", "object", &ObjectOptions::default())
.expect("operation should succeed");
assert_eq!(idx, 1);
}
#[test]
fn resolve_latest_object_info_candidates_returns_non_not_found_error() {
let err = resolve_latest_object_info_candidates(
vec![LatestObjectInfoCandidate {
info: None,
idx: 0,
err: Some(Error::ErasureReadQuorum),
}],
"bucket",
"object",
&ObjectOptions::default(),
)
.unwrap_err();
assert_eq!(err, Error::ErasureReadQuorum);
}
#[test]
fn resolve_latest_object_info_candidates_returns_version_not_found_for_versioned_lookups() {
let err = resolve_latest_object_info_candidates(
vec![LatestObjectInfoCandidate {
info: None,
idx: 0,
err: Some(Error::ObjectNotFound("bucket".to_string(), "object".to_string())),
}],
"bucket",
"object",
&ObjectOptions {
version_id: Some("vid-1".to_string()),
..Default::default()
},
)
.unwrap_err();
assert_eq!(
err,
Error::VersionNotFound("bucket".to_string(), "object".to_string(), "vid-1".to_string())
);
}
#[test]
fn pool_lookup_not_found_error_returns_object_not_found_for_latest_lookup() {
let err = pool_lookup_not_found_error("bucket", "object", &ObjectOptions::default());
assert_eq!(err, Error::ObjectNotFound("bucket".to_string(), "object".to_string()));
}
#[test]
fn pool_lookup_not_found_error_returns_version_not_found_for_versioned_lookup() {
let err = pool_lookup_not_found_error(
"bucket",
"object",
&ObjectOptions {
version_id: Some("vid-1".to_string()),
..Default::default()
},
);
assert_eq!(
err,
Error::VersionNotFound("bucket".to_string(), "object".to_string(), "vid-1".to_string())
);
}
#[test]
fn resolve_store_rebalance_pool_meta_reload_result_passthrough_ok() {
resolve_store_rebalance_pool_meta_reload_result(Ok(()), "reload_pool_meta")
.expect("successful pool meta reload should pass through");
}
#[test]
fn resolve_store_rebalance_pool_meta_reload_result_wraps_error_context() {
let err = resolve_store_rebalance_pool_meta_reload_result(Err(Error::SlowDown), "reload_pool_meta")
.expect_err("failed pool meta reload should be wrapped");
let err_message = err.to_string();
assert!(err_message.contains("store rebalance pool meta reload failed during reload_pool_meta"));
assert!(err_message.contains(&Error::SlowDown.to_string()));
}
#[test]
fn resolve_rebalance_delete_from_all_pools_result_passthrough_ok() {
let info = ObjectInfo {
bucket: "bucket".to_string(),
name: "object".to_string(),
..Default::default()
};
let resolved = resolve_rebalance_delete_from_all_pools_result(Ok(info.clone()), "bucket", "object")
.expect("successful rebalance delete should pass through");
assert_eq!(resolved.bucket, info.bucket);
assert_eq!(resolved.name, info.name);
}
#[test]
fn resolve_rebalance_delete_from_all_pools_result_wraps_object_context() {
let err = resolve_rebalance_delete_from_all_pools_result(Err(Error::SlowDown), "bucket", "object")
.expect_err("failed rebalance delete should be wrapped");
let rendered = err.to_string();
assert!(rendered.contains("failed to delete rebalance source object bucket/object"), "{rendered}");
assert!(rendered.contains(&Error::SlowDown.to_string()), "{rendered}");
}
#[test]
fn resolve_rebalance_delete_from_all_pools_results_fails_on_later_pool_error() {
let err = resolve_rebalance_delete_from_all_pools_results(
vec![
RebalanceDeletePoolResult {
pool_idx: 0,
result: Ok(ObjectInfo {
bucket: "bucket".to_string(),
name: "object".to_string(),
..Default::default()
}),
},
RebalanceDeletePoolResult {
pool_idx: 1,
result: Err(Error::SlowDown),
},
],
"bucket",
"object",
)
.expect_err("non-ignorable errors from later pools must not be hidden");
let rendered = err.to_string();
assert!(rendered.contains("pool 1 delete failed for bucket/object"), "{rendered}");
assert!(rendered.contains(&Error::SlowDown.to_string()), "{rendered}");
}
#[test]
fn resolve_rebalance_delete_from_all_pools_results_ignores_later_not_found_after_success() {
let info = ObjectInfo {
bucket: "bucket".to_string(),
name: "object".to_string(),
..Default::default()
};
let resolved = resolve_rebalance_delete_from_all_pools_results(
vec![
RebalanceDeletePoolResult {
pool_idx: 0,
result: Ok(info.clone()),
},
RebalanceDeletePoolResult {
pool_idx: 1,
result: Err(Error::ObjectNotFound("bucket".to_string(), "object".to_string())),
},
],
"bucket",
"object",
)
.expect("not-found errors from other pools should be ignored when a delete succeeds");
assert_eq!(resolved.bucket, info.bucket);
assert_eq!(resolved.name, info.name);
}
#[test]
fn resolve_rebalance_delete_from_all_pools_results_accepts_success_after_not_found() {
let info = ObjectInfo {
bucket: "bucket".to_string(),
name: "object".to_string(),
..Default::default()
};
let resolved = resolve_rebalance_delete_from_all_pools_results(
vec![
RebalanceDeletePoolResult {
pool_idx: 0,
result: Err(Error::ObjectNotFound("bucket".to_string(), "object".to_string())),
},
RebalanceDeletePoolResult {
pool_idx: 1,
result: Ok(info.clone()),
},
],
"bucket",
"object",
)
.expect("a successful delete should pass even when an earlier pool reports not-found");
assert_eq!(resolved.bucket, info.bucket);
assert_eq!(resolved.name, info.name);
}
#[test]
fn resolve_rebalance_delete_from_all_pools_results_fails_when_all_results_are_ignored_errors() {
let err = resolve_rebalance_delete_from_all_pools_results(
vec![
RebalanceDeletePoolResult {
pool_idx: 0,
result: Err(Error::ObjectNotFound("bucket".to_string(), "object".to_string())),
},
RebalanceDeletePoolResult {
pool_idx: 1,
result: Err(Error::VersionNotFound("bucket".to_string(), "object".to_string(), "vid-1".to_string())),
},
],
"bucket",
"object",
)
.expect_err("all ignored errors without any successful delete should still fail");
let rendered = err.to_string();
assert!(rendered.contains("pool 1 delete failed for bucket/object"), "{rendered}");
assert!(rendered.contains("Version not found"), "{rendered}");
}
#[test]
fn resolve_rebalance_delete_from_all_pools_results_fails_on_write_quorum_even_with_success() {
let err = resolve_rebalance_delete_from_all_pools_results(
vec![
RebalanceDeletePoolResult {
pool_idx: 0,
result: Ok(ObjectInfo {
bucket: "bucket".to_string(),
name: "object".to_string(),
..Default::default()
}),
},
RebalanceDeletePoolResult {
pool_idx: 1,
result: Err(Error::ErasureWriteQuorum),
},
],
"bucket",
"object",
)
.expect_err("write quorum failures must fail the aggregate delete");
let rendered = err.to_string();
assert!(rendered.contains("pool 1 delete failed for bucket/object"), "{rendered}");
assert!(rendered.contains(&Error::ErasureWriteQuorum.to_string()), "{rendered}");
}
#[test]
fn rebalance_disk_set_lookup_error_formats_pool_and_set_context() {
let err = rebalance_disk_set_lookup_error(2, 7, 3);
assert!(
err.to_string()
.contains("failed to resolve rebalance disk set: pool index 2, set index 7, pool count 3")
);
}
}