gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-22 12:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(ecstore): align decommission fence barriers

Browse Source
This commit is contained in:
overtrue
2026-08-22 08:06:48 +08:00
parent 856abfb46f
commit 4e9df33859
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/store/init.rs
+5 -5
View File
@@ -1264,7 +1264,7 @@ mod tests {
let barrier = crate::set_disk::PutObjectCommitBarrier::install( let barrier = crate::set_disk::PutObjectCommitBarrier::install(
bucket, bucket,
object, object,
crate::set_disk::PutObjectCommitPause::BeforeNamespace, crate::set_disk::PutObjectCommitPause::AfterNamespace,
); );
let migration_store = Arc::clone(store); let migration_store = Arc::clone(store);
let migration_bucket = bucket.to_string(); let migration_bucket = bucket.to_string();
@@ -1365,7 +1365,7 @@ mod tests {
&mut reader, &mut reader,
&ObjectOptions { &ObjectOptions {
version_suspended: true, version_suspended: true,
mod_time: Some(OffsetDateTime::UNIX_EPOCH), mod_time: Some(OffsetDateTime::UNIX_EPOCH + time::Duration::SECOND),
..Default::default() ..Default::default()
}, },
) )
@@ -2997,7 +2997,7 @@ mod tests {
let barrier = crate::set_disk::PutObjectCommitBarrier::install( let barrier = crate::set_disk::PutObjectCommitBarrier::install(
&bucket, &bucket,
&object, &object,
crate::set_disk::PutObjectCommitPause::BeforeNamespace, crate::set_disk::PutObjectCommitPause::AfterNamespace,
); );
let cleanup_barrier = crate::data_movement::SourceCleanupDeleteBarrier::install(&bucket, &object); let cleanup_barrier = crate::data_movement::SourceCleanupDeleteBarrier::install(&bucket, &object);
let source_set = store.pools[0].get_disks_by_key(&object); let source_set = store.pools[0].get_disks_by_key(&object);
@@ -3266,7 +3266,7 @@ mod tests {
object, object,
crate::store::object::DecommissionMutationFenceTestPhase::SourceCleanup, 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 source_set = store.pools[0].get_disks_by_key(object);
let worker_store = Arc::clone(&store); let worker_store = Arc::clone(&store);
let worker_bucket = bucket.clone(); let worker_bucket = bucket.clone();
@@ -3376,7 +3376,7 @@ mod tests {
let commit_barrier = crate::set_disk::PutObjectCommitBarrier::install( let commit_barrier = crate::set_disk::PutObjectCommitBarrier::install(
&bucket, &bucket,
object, object,
crate::set_disk::PutObjectCommitPause::BeforeNamespace, crate::set_disk::PutObjectCommitPause::AfterNamespace,
); );
let source_set = store.pools[1].get_disks_by_key(object); let source_set = store.pools[1].get_disks_by_key(object);
let worker_store = Arc::clone(&store); let worker_store = Arc::clone(&store);
crates/ecstore/src/store/object.rs
+2
View File
@@ -3036,6 +3036,8 @@ impl ECStore {
Err(err) if is_err_object_not_found(&err) && should_create_delete_marker_for_missing_object(&opts) => { 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 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?; 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); obj.name = decode_dir_object(object);
return Ok(obj); return Ok(obj);
} }