astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-10-30 12:30:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(replication): scope resync cancellation and drain worker lifecycle

Browse Source 
Signed-off-by: Feng Ruohang <rh@vonng.com>
This commit is contained in:
Feng Ruohang
2026-09-09 14:34:42 +08:00
parent 63aace4099
commit 702f113f51
6 changed files with 636 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/site-replication-utils.go
+19 -3
View File
@@ -204,16 +204,24 @@ func (sm *siteResyncMetrics) updateState(s SiteResyncStatus) error {
switch s.Status {
case ResyncStarted:
sm.peerResyncMap[s.DeplID] = resyncState{resyncID: s.ResyncID, LastSaved: time.Time{}}
sm.resyncStatus[s.ResyncID] = s
sm.resyncStatus[s.ResyncID] = s.clone()
case ResyncCompleted, ResyncCanceled, ResyncFailed:
st, ok := sm.resyncStatus[s.ResyncID]
if ok {
st.LastUpdate = s.LastUpdate
st.Status = s.Status
if s.Status == ResyncCanceled {
for bucket, status := range st.BucketStatuses {
if status == ResyncPending || status == ResyncStarted {
st.BucketStatuses[bucket] = ResyncCanceled
}
}
}
sm.resyncStatus[s.ResyncID] = st
return nil
}
sm.resyncStatus[s.ResyncID] = st
return saveSiteResyncMetadata(GlobalContext, st, newObjectLayerFn())
sm.resyncStatus[s.ResyncID] = s.clone()
return saveSiteResyncMetadata(GlobalContext, s, newObjectLayerFn())
}
return nil
}
@@ -230,7 +238,15 @@ func (sm *siteResyncMetrics) incBucket(o resyncOpts, bktStatus ResyncStatusType)
if st.BucketStatuses == nil {
st.BucketStatuses = map[string]ResyncStatusType{}
}
if st.BucketStatuses[o.bucket] == ResyncCanceled {
return
}
switch bktStatus {
case ResyncCanceled:
st.BucketStatuses[o.bucket] = ResyncCanceled
st.Status = ResyncCanceled
st.LastUpdate = UTCNow()
sm.resyncStatus[o.resyncID] = st
case ResyncCompleted:
st.BucketStatuses[o.bucket] = ResyncCompleted
st.Status = siteResyncStatus(st.Status, st.BucketStatuses)