From ca8d4c2ea7348810b196cac85b28df1275041786 Mon Sep 17 00:00:00 2001 From: overtrue Date: Sat, 22 Aug 2026 08:06:48 +0800 Subject: [PATCH] test(ecstore): align decommission fence barriers --- crates/ecstore/src/store/init.rs | 10 +++++----- crates/ecstore/src/store/object.rs | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/crates/ecstore/src/store/init.rs b/crates/ecstore/src/store/init.rs index a779345dd..aec093df9 100644 --- a/crates/ecstore/src/store/init.rs +++ b/crates/ecstore/src/store/init.rs @@ -1264,7 +1264,7 @@ mod tests { let barrier = crate::set_disk::PutObjectCommitBarrier::install( bucket, object, - crate::set_disk::PutObjectCommitPause::BeforeNamespace, + crate::set_disk::PutObjectCommitPause::AfterNamespace, ); let migration_store = Arc::clone(store); let migration_bucket = bucket.to_string(); @@ -1365,7 +1365,7 @@ mod tests { &mut reader, &ObjectOptions { version_suspended: true, - mod_time: Some(OffsetDateTime::UNIX_EPOCH), + mod_time: Some(OffsetDateTime::UNIX_EPOCH + time::Duration::SECOND), ..Default::default() }, ) @@ -2997,7 +2997,7 @@ mod tests { let barrier = crate::set_disk::PutObjectCommitBarrier::install( &bucket, &object, - crate::set_disk::PutObjectCommitPause::BeforeNamespace, + crate::set_disk::PutObjectCommitPause::AfterNamespace, ); let cleanup_barrier = crate::data_movement::SourceCleanupDeleteBarrier::install(&bucket, &object); let source_set = store.pools[0].get_disks_by_key(&object); @@ -3266,7 +3266,7 @@ mod tests { object, crate::store::object::DecommissionMutationFenceTestPhase::SourceCleanup, ); - let barrier = crate::set_disk::DeleteObjectCommitBarrier::install(&bucket, object); + let barrier = crate::data_movement::SourceCleanupDeleteBarrier::install(&bucket, object); let source_set = store.pools[0].get_disks_by_key(object); let worker_store = Arc::clone(&store); let worker_bucket = bucket.clone(); @@ -3376,7 +3376,7 @@ mod tests { let commit_barrier = crate::set_disk::PutObjectCommitBarrier::install( &bucket, object, - crate::set_disk::PutObjectCommitPause::BeforeNamespace, + crate::set_disk::PutObjectCommitPause::AfterNamespace, ); let source_set = store.pools[1].get_disks_by_key(object); let worker_store = Arc::clone(&store); diff --git a/crates/ecstore/src/store/object.rs b/crates/ecstore/src/store/object.rs index 002fea448..249a941c6 100644 --- a/crates/ecstore/src/store/object.rs +++ b/crates/ecstore/src/store/object.rs @@ -3036,6 +3036,8 @@ impl ECStore { Err(err) if is_err_object_not_found(&err) && should_create_delete_marker_for_missing_object(&opts) => { let target_pool_idx = self.get_pool_idx_no_lock(bucket, object, 0).await?; let mut obj = self.pools[target_pool_idx].delete_object(bucket, object, opts).await?; + #[cfg(test)] + pause_versioned_delete_marker_after_commit(bucket, object).await; obj.name = decode_dir_object(object); return Ok(obj); }