octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-12-28 21:02:47 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1339 from felix9/fix_1251

Browse Source 
fixes #1251, race when writing indexes
This commit is contained in:
Alexander Neumann 2017-10-07 16:36:16 +02:00
commit 17d688afef
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/repository/master_index.go
View File

@ -120,19 +120,16 @@ func (mi *MasterIndex) Remove(index *Index) {
// Store remembers the id and pack in the index. // Store remembers the id and pack in the index.
func (mi *MasterIndex) Store(pb restic.PackedBlob) { func (mi *MasterIndex) Store(pb restic.PackedBlob) {
mi.idxMutex.RLock() mi.idxMutex.Lock()
defer mi.idxMutex.Unlock()
for _, idx := range mi.idx { for _, idx := range mi.idx {
if !idx.Final() { if !idx.Final() {
mi.idxMutex.RUnlock()
idx.Store(pb) idx.Store(pb)
return return
} }
} }
mi.idxMutex.RUnlock()
mi.idxMutex.Lock()
defer mi.idxMutex.Unlock()
newIdx := NewIndex() newIdx := NewIndex()
newIdx.Store(pb) newIdx.Store(pb)
mi.idx = append(mi.idx, newIdx) mi.idx = append(mi.idx, newIdx)