gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-19 11:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(replication): persist force-delete handoff state (#5641)

Browse Source 
* fix(replication): persist force-delete handoff state

* fix(arch): route force-delete config access through boundary

* style: format force-delete imports

---------

Co-authored-by: Zhengchao An <anzhengchao@gmail.com>
This commit is contained in:
cxymds
2026-08-03 09:44:28 +08:00
committed by GitHub
parent 035ce5d784
commit 380ec74ece
19 changed files with 662 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/replication/src/delete.rs
+41 -6
View File
@@ -33,12 +33,15 @@ impl DeletedObjectReplicationInfo {
return vec![self.target_arn.clone()];
}
let mut target_arns = self
.delete_object
.replication_state
.as_ref()
.map(admitted_target_arns_from_replication_state)
.unwrap_or_default();
let mut target_arns = if !self.delete_object.force_delete_target_arns.is_empty() {
self.delete_object.force_delete_target_arns.clone()
} else {
self.delete_object
.replication_state
.as_ref()
.map(admitted_target_arns_from_replication_state)
.unwrap_or_default()
};
target_arns.sort();
target_arns.dedup();
target_arns
@@ -69,6 +72,9 @@ impl ReplicationWorkerOperation for DeletedObjectReplicationInfo {
.delete_marker_mtime
.and_then(|t| i64::try_from(t.unix_timestamp_nanos()).ok()),
target_arns: self.admitted_target_arns(),
force_delete_id: self.delete_object.force_delete_id,
force_delete_generation: self.delete_object.force_delete_generation,
force_delete_local_commit: self.delete_object.force_delete,
}
}
@@ -231,6 +237,35 @@ mod tests {
);
}
#[test]
fn deleted_object_replication_info_preserves_force_delete_handoff() {
let operation_id = Uuid::new_v4();
let info = DeletedObjectReplicationInfo {
bucket: "bucket".to_string(),
delete_object: DeletedObject {
object_name: "prefix/".to_string(),
force_delete: true,
force_delete_id: Some(operation_id),
force_delete_target_arns: vec![
"arn:target-b".to_string(),
"arn:target-a".to_string(),
"arn:target-b".to_string(),
],
force_delete_generation: Some(17),
..Default::default()
},
..Default::default()
};
let entry = info.to_mrf_entry();
assert!(entry.force_delete);
assert_eq!(entry.force_delete_id, Some(operation_id));
assert_eq!(entry.force_delete_generation, Some(17));
assert!(entry.force_delete_local_commit);
assert_eq!(entry.target_arns, vec!["arn:target-a", "arn:target-b"]);
}
#[test]
fn version_delete_replication_tracks_delete_marker_version_purge() {
let dobj = DeletedObject {