octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-04-11 03:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model, lib/scanner: Prevent races aborting scans (fixes #6994) (#6997)

Browse Source
This commit is contained in:
Simon Frei 2020-09-25 11:27:44 +02:00 committed by GitHub
parent c390565eef
commit 8452fd2ab4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/model/folder.go
View File

@ -520,6 +520,11 @@ func (f *folder) scanSubdirs(subDirs []string) error {
}
if err := batch.flushIfFull(); err != nil {
// Prevent a race between the scan aborting due to context
// cancellation and releasing the snapshot in defer here.
scanCancel()
for range fchan {
}
return err
}

4
lib/scanner/blockqueue.go
View File

@ -136,6 +136,10 @@ func (ph *parallelHasher) hashFiles(ctx context.Context) {
func (ph *parallelHasher) closeWhenDone() {
ph.wg.Wait()
// In case the hasher aborted on context, wait for filesystem
// walking/progress routine to finish.
for range ph.inbox {
}
if ph.done != nil {
close(ph.done)
}