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

fix(ecstore): reuse fixed fence for reverse decommission

Browse Source
This commit is contained in:
overtrue
2026-08-22 02:31:10 +08:00
parent 4221a2df08
commit d168b69a47
4 changed files with 229 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/data_movement/mod.rs
+3 -11
View File
@@ -1447,11 +1447,8 @@ async fn migrate_object_inner(
if should_use_multipart_data_movement(&object_info, has_part_checksums) {
let mut new_multipart_opts = data_movement_new_multipart_opts(&object_info, pool_idx);
new_multipart_opts.expected_bucket_incarnation_id = source_bucket_incarnation_id;
if let Some(fence) = mutation_fence {
fence.add_namespace_lock_fence(&mut new_multipart_opts);
}
let (res, target_pool_idx, expected_bucket_incarnation_id) = match store
.handle_new_multipart_upload_with_pool_idx(&bucket, &object_info.name, &new_multipart_opts)
.handle_new_multipart_upload_with_pool_idx(&bucket, &object_info.name, &new_multipart_opts, mutation_fence)
.await
{
Ok(res) => res,
@@ -1546,9 +1543,6 @@ async fn migrate_object_inner(
)
})?;
complete_multipart_opts.expected_bucket_incarnation_id = expected_bucket_incarnation_id;
if let Some(fence) = mutation_fence {
fence.add_namespace_lock_fence(&mut complete_multipart_opts);
}
if let Err(err) = store
.clone()
.complete_multipart_upload_for_data_movement(
@@ -1558,6 +1552,7 @@ async fn migrate_object_inner(
&res.upload_id,
parts,
&complete_multipart_opts,
mutation_fence,
)
.await
{
@@ -1712,11 +1707,8 @@ async fn migrate_object_inner(
let mut put_opts = data_movement_put_object_opts(&object_info, pool_idx);
put_opts.expected_bucket_incarnation_id = source_bucket_incarnation_id;
if let Some(fence) = mutation_fence {
fence.add_namespace_lock_fence(&mut put_opts);
}
let (target_pool_idx, put_result) = store
.put_object_for_data_movement(&bucket, &object_info.name, &mut data, &put_opts)
.put_object_for_data_movement(&bucket, &object_info.name, &mut data, &put_opts, mutation_fence)
.await
.map_err(|err| data_movement_stage_error(op_label, "prepare_put_object", &bucket, &object_info.name, err))?;
if let Err(err) = put_result {