Merge pull request #1339 from felix9/fix_1251

fixes #1251, race when writing indexes
This commit is contained in:
Alexander Neumann 2017-10-07 16:36:16 +02:00
commit 17d688afef

View file

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