fix(ecstore): repair rebalance fence test wiring

This commit is contained in:
overtrue
2026-08-22 00:48:53 +08:00
parent 209d3481da
commit a69fb0882d
6 changed files with 9 additions and 3 deletions
-1
View File
@@ -47,7 +47,6 @@ use crate::storage_api_contracts::{
admin::StorageAdminApi,
bucket::{BucketOperations, BucketOptions, MakeBucketOptions},
heal::HealOperations as _,
namespace::NamespaceLocking as _,
object::{EcstoreObjectIO, ObjectIO as _, ObjectOperations as _},
};
use crate::{core::sets::Sets, store::ECStore};
@@ -909,7 +909,7 @@ mod tests {
use super::*;
use crate::disk::{DiskAPI as _, RUSTFS_META_BUCKET};
use crate::object_api::NamespaceLockFence;
use crate::set_disk::ops::object::hermetic_set_disks_support::hermetic_set_disks_isolated;
use crate::set_disk::hermetic_set_disks_isolated;
#[test]
fn rebalance_activation_rejects_persisted_decommission_despite_idle_local_snapshot() {
@@ -51,6 +51,7 @@ use super::worker::{
use super::{
DiskStat, GetObjectReader, ObjectInfo, ObjectOptions, RebalSaveOpt, RebalStatus, RebalanceBucketConfigs,
RebalanceBucketOutcome, RebalanceCleanupWarnings, RebalanceEntryOutcome, RebalanceInfo, RebalanceMeta, RebalanceStats,
RebalanceStopPropagationRecord,
};
use super::{REBALANCE_DEFERRED_ENTRY_ERROR_PREFIX, REBALANCE_SOURCE_CLEANUP_DEFERRED_ERROR_PREFIX};
use crate::bucket::replication::{ReplicationState, ReplicationStatusType, replication_state_to_filemeta};
+3
View File
@@ -735,6 +735,9 @@ pub(crate) use core::io_primitives::disk_call_counters;
mod ctx;
mod metadata;
mod ops;
#[cfg(test)]
pub(crate) use ops::hermetic_set_disks_isolated;
#[cfg(any(test, feature = "test-util"))]
pub use ops::multipart::{MultipartCommitBarrier, MultipartCommitPause};
#[cfg(feature = "test-util")]
+3
View File
@@ -25,3 +25,6 @@ pub(crate) mod list;
pub(crate) mod locking;
pub(crate) mod multipart;
pub(crate) mod object;
#[cfg(test)]
pub(crate) use object::hermetic_set_disks_support::hermetic_set_disks_isolated;
+1 -1
View File
@@ -7613,7 +7613,7 @@ mod object_encryption_resolver_wiring_tests {
}
#[cfg(test)]
pub(crate) mod hermetic_set_disks_support {
pub(in crate::set_disk::ops) mod hermetic_set_disks_support {
//! Shared hermetic `SetDisks` construction for the ops tests below: the
//! `SetDisks` under test is built directly on formatted local disks (same
//! pattern as the `ops/locking.rs` tests) so the tests stay hermetic — no