1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-12-23 00:07:25 +00:00

cache: Fix recheck logic, remove channel from inProgress

This commit is contained in:
Alexander Neumann 2018-10-04 17:09:43 +02:00
parent 19725954ee
commit 5971650f77

View file

@ -107,16 +107,17 @@ func (b *Backend) cacheFile(ctx context.Context, h restic.Handle) error {
}
// test again, maybe the file was cached in the meantime
if b.Cache.Has(h) {
return nil
}
if !b.Cache.Has(h) {
err := b.Backend.Load(ctx, h, 0, 0, func(rd io.Reader) error {
return b.Cache.Save(h, rd)
})
if err != nil {
// try to remove from the cache, ignore errors
_ = b.Cache.Remove(h)
// nope, it's still not in the cache, pull it from the repo and save it
err := b.Backend.Load(ctx, h, 0, 0, func(rd io.Reader) error {
return b.Cache.Save(h, rd)
})
if err != nil {
// try to remove from the cache, ignore errors
_ = b.Cache.Remove(h)
}
}
// signal other waiting goroutines that the file may now be cached