KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

fixes #1251, race when writing indexes

Browse source
This commit is contained in:
Felix Lee 2017-10-07 05:11:42 -07:00
parent 88fb60e0b5
commit cc5ada63a4
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)