MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-07-13 02:51:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: potential data conflicts save site-resync metadata (#16926)

Browse Source
This commit is contained in:
jiuker 2023-03-31 11:59:45 +08:00 committed by GitHub
parent d703daa480
commit a7b7860e0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/site-replication-utils.go
View File

@ -170,6 +170,7 @@ func (sm *siteResyncMetrics) save(ctx context.Context) {
case <-sTimer.C: case <-sTimer.C:
if globalSiteReplicationSys.isEnabled() { if globalSiteReplicationSys.isEnabled() {
sm.Lock() sm.Lock()
wg := sync.WaitGroup{}
for dID, rs := range sm.peerResyncMap { for dID, rs := range sm.peerResyncMap {
st, ok := sm.resyncStatus[rs.resyncID] st, ok := sm.resyncStatus[rs.resyncID]
if ok { if ok {
@ -179,9 +180,14 @@ func (sm *siteResyncMetrics) save(ctx context.Context) {
} }
rs.LastSaved = UTCNow() rs.LastSaved = UTCNow()
sm.peerResyncMap[dID] = rs sm.peerResyncMap[dID] = rs
go saveSiteResyncMetadata(ctx, st, newObjectLayerFn()) wg.Add(1)
go func() {
defer wg.Done()
saveSiteResyncMetadata(ctx, st, newObjectLayerFn())
}()
} }
} }
wg.Wait()
sm.Unlock() sm.Unlock()
} }
sTimer.Reset(siteResyncSaveInterval) sTimer.Reset(siteResyncSaveInterval)