gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-28 07:57:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ecstore): tighten decommission test-helper cfg gates to test-util (#6708)

Browse Source
This commit is contained in:
Zhengchao An
2026-08-27 10:08:41 +08:00
committed by GitHub
parent 7b7e5f38f7
commit f1f8057154
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/core/pools.rs
+13 -13
View File
@@ -13,7 +13,7 @@
// limitations under the License. // limitations under the License.
use crate::bucket::replication::replication_state_from_filemeta; use crate::bucket::replication::replication_state_from_filemeta;
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
use crate::bucket::utils::is_meta_bucketname; use crate::bucket::utils::is_meta_bucketname;
use crate::bucket::versioning_sys::BucketVersioningSys; use crate::bucket::versioning_sys::BucketVersioningSys;
use crate::bucket::{ use crate::bucket::{
@@ -8503,7 +8503,7 @@ impl ECStore {
.await .await
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
pub(crate) async fn decommission_entry_for_test_with_bucket_incarnation( pub(crate) async fn decommission_entry_for_test_with_bucket_incarnation(
self: &Arc<Self>, self: &Arc<Self>,
idx: usize, idx: usize,
@@ -8671,7 +8671,7 @@ impl ECStore {
Ok(()) Ok(())
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
pub(crate) async fn decommission_pool_for_test( pub(crate) async fn decommission_pool_for_test(
self: &Arc<Self>, self: &Arc<Self>,
rx: CancellationToken, rx: CancellationToken,
@@ -9587,7 +9587,7 @@ impl ECStore {
Ok(receipt_paths) Ok(receipt_paths)
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
async fn persist_decommission_durable_ilm_manifest(&self, source_pool_idx: usize) -> Result<()> { async fn persist_decommission_durable_ilm_manifest(&self, source_pool_idx: usize) -> Result<()> {
let run_token = self.durable_ilm_receipt_run_token(source_pool_idx).await?; let run_token = self.durable_ilm_receipt_run_token(source_pool_idx).await?;
self.persist_decommission_durable_ilm_manifest_for_run(source_pool_idx, &run_token) self.persist_decommission_durable_ilm_manifest_for_run(source_pool_idx, &run_token)
@@ -9705,7 +9705,7 @@ impl ECStore {
Ok(receipts) Ok(receipts)
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
async fn persist_decommission_durable_ilm_receipt( async fn persist_decommission_durable_ilm_receipt(
&self, &self,
source_pool_idx: usize, source_pool_idx: usize,
@@ -10309,7 +10309,7 @@ impl ECStore {
Ok(()) Ok(())
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
async fn verify_and_cleanup_decommissioned_durable_ilm_record( async fn verify_and_cleanup_decommissioned_durable_ilm_record(
&self, &self,
source_pool_idx: usize, source_pool_idx: usize,
@@ -10381,7 +10381,7 @@ impl ECStore {
resolve_decommission_entry_cleanup_delete_result(cleanup_result, RUSTFS_META_BUCKET, path) resolve_decommission_entry_cleanup_delete_result(cleanup_result, RUSTFS_META_BUCKET, path)
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
pub(crate) async fn verify_and_cleanup_decommissioned_durable_ilm_record_for_test( pub(crate) async fn verify_and_cleanup_decommissioned_durable_ilm_record_for_test(
&self, &self,
source_pool_idx: usize, source_pool_idx: usize,
@@ -10392,12 +10392,12 @@ impl ECStore {
.await .await
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
pub(crate) async fn decommission_durable_ilm_receipt_count_for_test(&self, source_pool_idx: usize) -> Result<usize> { pub(crate) async fn decommission_durable_ilm_receipt_count_for_test(&self, source_pool_idx: usize) -> Result<usize> {
Ok(self.list_decommission_durable_ilm_receipts(source_pool_idx).await?.len()) Ok(self.list_decommission_durable_ilm_receipts(source_pool_idx).await?.len())
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
pub(crate) async fn decommission_durable_ilm_receipt_paths_for_test( pub(crate) async fn decommission_durable_ilm_receipt_paths_for_test(
&self, &self,
source_pool_idx: usize, source_pool_idx: usize,
@@ -10405,7 +10405,7 @@ impl ECStore {
self.list_decommission_durable_ilm_receipts(source_pool_idx).await self.list_decommission_durable_ilm_receipts(source_pool_idx).await
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
pub(crate) async fn persist_decommission_durable_ilm_receipt_for_test( pub(crate) async fn persist_decommission_durable_ilm_receipt_for_test(
&self, &self,
source_pool_idx: usize, source_pool_idx: usize,
@@ -10424,12 +10424,12 @@ impl ECStore {
Ok(decommission_durable_ilm_receipt_path(&run_token, source_path, record.id_kind, &record.id)) Ok(decommission_durable_ilm_receipt_path(&run_token, source_path, record.id_kind, &record.id))
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
pub(crate) async fn persist_decommission_durable_ilm_manifest_for_test(&self, source_pool_idx: usize) -> Result<()> { pub(crate) async fn persist_decommission_durable_ilm_manifest_for_test(&self, source_pool_idx: usize) -> Result<()> {
self.persist_decommission_durable_ilm_manifest(source_pool_idx).await self.persist_decommission_durable_ilm_manifest(source_pool_idx).await
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
pub(crate) async fn cleanup_decommission_durable_ilm_receipts_for_test(&self, source_pool_idx: usize) -> Result<()> { pub(crate) async fn cleanup_decommission_durable_ilm_receipts_for_test(&self, source_pool_idx: usize) -> Result<()> {
self.cleanup_decommission_durable_ilm_receipts(source_pool_idx).await self.cleanup_decommission_durable_ilm_receipts(source_pool_idx).await
} }
@@ -10782,7 +10782,7 @@ impl ECStore {
self.ensure_decommission_multipart_uploads_drained(idx, pool.as_ref(), &buckets) self.ensure_decommission_multipart_uploads_drained(idx, pool.as_ref(), &buckets)
.await .await
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
pub(crate) async fn check_after_decommission_for_test(self: &Arc<Self>, idx: usize) -> Result<()> { pub(crate) async fn check_after_decommission_for_test(self: &Arc<Self>, idx: usize) -> Result<()> {
let generation = self.active_decommission_generation(idx).await?; let generation = self.active_decommission_generation(idx).await?;
self.check_after_decommission(idx, &CancellationToken::new(), generation) self.check_after_decommission(idx, &CancellationToken::new(), generation)
crates/ecstore/src/store/object.rs
+7 -7
View File
@@ -490,7 +490,7 @@ fn decommission_mutation_fence_for_test(
.map(|hook| hook.fence.clone()) .map(|hook| hook.fence.clone())
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
struct DecommissionFreeVersionSourceRaceState { struct DecommissionFreeVersionSourceRaceState {
bucket: String, bucket: String,
object: String, object: String,
@@ -498,17 +498,17 @@ struct DecommissionFreeVersionSourceRaceState {
release: tokio::sync::Notify, release: tokio::sync::Notify,
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
pub(crate) struct DecommissionFreeVersionSourceRaceBarrier { pub(crate) struct DecommissionFreeVersionSourceRaceBarrier {
state: Arc<DecommissionFreeVersionSourceRaceState>, state: Arc<DecommissionFreeVersionSourceRaceState>,
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
static DECOMMISSION_FREE_VERSION_SOURCE_RACE_BARRIER: std::sync::OnceLock< static DECOMMISSION_FREE_VERSION_SOURCE_RACE_BARRIER: std::sync::OnceLock<
std::sync::Mutex<Option<Arc<DecommissionFreeVersionSourceRaceState>>>, std::sync::Mutex<Option<Arc<DecommissionFreeVersionSourceRaceState>>>,
> = std::sync::OnceLock::new(); > = std::sync::OnceLock::new();
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
impl DecommissionFreeVersionSourceRaceBarrier { impl DecommissionFreeVersionSourceRaceBarrier {
pub(crate) fn install(bucket: &str, object: &str) -> Self { pub(crate) fn install(bucket: &str, object: &str) -> Self {
let state = Arc::new(DecommissionFreeVersionSourceRaceState { let state = Arc::new(DecommissionFreeVersionSourceRaceState {
@@ -537,7 +537,7 @@ impl DecommissionFreeVersionSourceRaceBarrier {
} }
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
impl Drop for DecommissionFreeVersionSourceRaceBarrier { impl Drop for DecommissionFreeVersionSourceRaceBarrier {
fn drop(&mut self) { fn drop(&mut self) {
self.state.release.notify_one(); self.state.release.notify_one();
@@ -551,7 +551,7 @@ impl Drop for DecommissionFreeVersionSourceRaceBarrier {
} }
} }
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
async fn pause_decommission_free_version_before_source_lock(bucket: &str, object: &str) { async fn pause_decommission_free_version_before_source_lock(bucket: &str, object: &str) {
let state = DECOMMISSION_FREE_VERSION_SOURCE_RACE_BARRIER let state = DECOMMISSION_FREE_VERSION_SOURCE_RACE_BARRIER
.get_or_init(|| std::sync::Mutex::new(None)) .get_or_init(|| std::sync::Mutex::new(None))
@@ -2385,7 +2385,7 @@ impl ECStore {
&object, &object,
)? )?
}; };
#[cfg(test)] #[cfg(all(test, feature = "test-util"))]
if is_free_version { if is_free_version {
pause_decommission_free_version_before_source_lock(bucket, logical_object).await; pause_decommission_free_version_before_source_lock(bucket, logical_object).await;
} }