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

cache: Fix recheck logic, remove channel from inProgress

Browse source
This commit is contained in:
Alexander Neumann 2018-10-04 17:09:43 +02:00
parent 19725954ee
commit 5971650f77
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/cache/backend.go vendored
View file

@ -107,9 +107,9 @@ func (b *Backend) cacheFile(ctx context.Context, h restic.Handle) error {
} }
// test again, maybe the file was cached in the meantime // test again, maybe the file was cached in the meantime
if b.Cache.Has(h) { if !b.Cache.Has(h) {
return nil
} // 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 { err := b.Backend.Load(ctx, h, 0, 0, func(rd io.Reader) error {
return b.Cache.Save(h, rd) return b.Cache.Save(h, rd)
@ -118,6 +118,7 @@ func (b *Backend) cacheFile(ctx context.Context, h restic.Handle) error {
// try to remove from the cache, ignore errors // try to remove from the cache, ignore errors
_ = b.Cache.Remove(h) _ = b.Cache.Remove(h)
} }
}
// signal other waiting goroutines that the file may now be cached // signal other waiting goroutines that the file may now be cached
close(finish) close(finish)