gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-09-07 20:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(site-replication): serialize topology replay

Browse Source
This commit is contained in:
overtrue
2026-09-05 11:30:47 +08:00
parent bde7c58892
commit 2aaa97259a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/admin/handlers/site_replication.rs
+9 -3
View File
@@ -1852,7 +1852,7 @@ fn reconcile_site_replication_wiring() -> std::pin::Pin<Box<dyn std::future::Fut
// The scheduler starts before IAM and the object store are guaranteed ready (IAM // The scheduler starts before IAM and the object store are guaranteed ready (IAM
// bootstrap may still be recovering), so an early tick returns quietly instead of // bootstrap may still be recovering), so an early tick returns quietly instead of
// logging a failure for every reconciler. // logging a failure for every reconciler.
let Some(_lifecycle) = SiteReplicationLifecycleGuard::try_acquire() else { let Some(lifecycle) = SiteReplicationLifecycleGuard::try_acquire() else {
return; return;
}; };
@@ -1910,8 +1910,9 @@ fn reconcile_site_replication_wiring() -> std::pin::Pin<Box<dyn std::future::Fut
"admin site replication state" "admin site replication state"
); );
} }
// Failed peer deliveries recorded in the retry queue; runs behind the // The retry path re-checks membership per request under the bucket-op
// same lifecycle guard and pending_* gates as the reconcilers above. // lock; release lifecycle before a potentially large replay.
drop(lifecycle);
drain_site_replication_retry_queue().await; drain_site_replication_retry_queue().await;
}) })
} }
@@ -6232,6 +6233,10 @@ impl Operation for SiteReplicationAddHandler {
// this add was planned against is still the current one. The error // this add was planned against is still the current one. The error
// says so: by this point the remote sites already accepted their // says so: by this point the remote sites already accepted their
// joins, and re-running the add is what reconverges the local side. // joins, and re-running the add is what reconverges the local side.
// Serialize peer visibility with local bucket deletion: whichever
// side wins this lock determines whether the new peer is included in
// the delete intent or bootstraps from the post-delete bucket set.
let bucket_op_guard = SITE_REPLICATION_BUCKET_OP_LOCK.write().await;
let next_state = state; let next_state = state;
let (state, edit_generation) = update_site_replication_state(move |state| { let (state, edit_generation) = update_site_replication_state(move |state| {
if state.updated_at != expected_updated_at || pending_endpoint_refresh(state).is_some() { if state.updated_at != expected_updated_at || pending_endpoint_refresh(state).is_some() {
@@ -6245,6 +6250,7 @@ impl Operation for SiteReplicationAddHandler {
Ok((state.clone(), edit_generation)) Ok((state.clone(), edit_generation))
}) })
.await?; .await?;
drop(bucket_op_guard);
// The finalize fan-out delivers peer-edit payloads, so it carries the // The finalize fan-out delivers peer-edit payloads, so it carries the
// generation allocated in the commit above: the receiving site orders // generation allocated in the commit above: the receiving site orders