mirror/syncthing
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2026-05-19 06:08:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(scanner): don't warn about cancelled scan (#9920)

Browse Source 
We expect a context cancellation when a folder is restarted during a
scan.
This commit is contained in:
Jakob Borg
2025-01-13 18:35:55 +01:00
committed by GitHub
parent 2834bad85e
commit 1fbd396ffa
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/scanner/walk.go
View File

@@ -243,7 +243,7 @@ const walkFailureEventDesc = "Unexpected error while walking the filesystem duri
func (w *walker) scan(ctx context.Context, toHashChan chan<- protocol.FileInfo, finishedChan chan<- ScanResult) {
hashFiles := w.walkAndHashFiles(ctx, toHashChan, finishedChan)
if len(w.Subs) == 0 {
if err := w.Filesystem.Walk(".", hashFiles); err != nil && !errors.Is(err, fs.SkipDir) {
if err := w.Filesystem.Walk(".", hashFiles); isWarnableError(err) {
w.EventLogger.Log(events.Failure, walkFailureEventDesc)
l.Warnf("Aborted scan due to an unexpected error: %v", err)
}
@@ -253,7 +253,7 @@ func (w *walker) scan(ctx context.Context, toHashChan chan<- protocol.FileInfo,
l.Debugf("%v: Skip walking %v as it is below a symlink", w, sub)
continue
}
if err := w.Filesystem.Walk(sub, hashFiles); err != nil && !errors.Is(err, fs.SkipDir) {
if err := w.Filesystem.Walk(sub, hashFiles); isWarnableError(err) {
w.EventLogger.Log(events.Failure, walkFailureEventDesc)
l.Warnf("Aborted scan of path '%v' due to an unexpected error: %v", sub, err)
}
@@ -262,6 +262,14 @@ func (w *walker) scan(ctx context.Context, toHashChan chan<- protocol.FileInfo,
close(toHashChan)
}
// isWarnableError returns true if err is a kind of error we should warn
// about receiving from the folder walk.
func isWarnableError(err error) bool {
return err != nil &&
!errors.Is(err, fs.SkipDir) && // intentional skip
!errors.Is(err, context.Canceled) // folder restarting
}
func (w *walker) walkAndHashFiles(ctx context.Context, toHashChan chan<- protocol.FileInfo, finishedChan chan<- ScanResult) fs.WalkFunc {
now := time.Now()
ignoredParent := ""