Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/scanner: Pass on errors while hashing (#7380)

This commit is contained in:
Simon Frei 2021-02-19 08:51:39 +01:00 committed by GitHub
parent 57a7f4391f
commit 78c2844e3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/scanner/blockqueue.go
View File

@ -104,7 +104,7 @@ func (ph *parallelHasher) hashFiles(ctx context.Context) {
blocks, err := HashFile(ctx, ph.fs, f.Name, f.BlockSize(), ph.counter, true)
if err != nil {
l.Debugln("hash error:", f.Name, err)
handleError(ctx, "hashing", f.Name, err, ph.outbox)
continue
}

12
lib/scanner/walk.go
View File

@ -253,7 +253,7 @@ func (w *walker) walkAndHashFiles(ctx context.Context, toHashChan chan<- protoco
}
if !utf8.ValidString(path) {
w.handleError(ctx, "scan", path, errUTF8Invalid, finishedChan)
handleError(ctx, "scan", path, errUTF8Invalid, finishedChan)
return skip
}
@ -285,7 +285,7 @@ func (w *walker) walkAndHashFiles(ctx context.Context, toHashChan chan<- protoco
}
if err != nil {
w.handleError(ctx, "scan", path, err, finishedChan)
handleError(ctx, "scan", path, err, finishedChan)
return skip
}
@ -316,7 +316,7 @@ func (w *walker) walkAndHashFiles(ctx context.Context, toHashChan chan<- protoco
info, err = w.Filesystem.Lstat(ignoredParent)
// An error here would be weird as we've already gotten to this point, but act on it nonetheless
if err != nil {
w.handleError(ctx, "scan", ignoredParent, err, finishedChan)
handleError(ctx, "scan", ignoredParent, err, finishedChan)
return skip
}
if err = w.handleItem(ctx, ignoredParent, info, toHashChan, finishedChan, skip); err != nil {
@ -333,7 +333,7 @@ func (w *walker) handleItem(ctx context.Context, path string, info fs.FileInfo,
oldPath := path
path, err := w.normalizePath(path, info)
if err != nil {
w.handleError(ctx, "normalizing path", oldPath, err, finishedChan)
handleError(ctx, "normalizing path", oldPath, err, finishedChan)
return skip
}
@ -451,7 +451,7 @@ func (w *walker) walkSymlink(ctx context.Context, relPath string, info fs.FileIn
f, err := CreateFileInfo(info, relPath, w.Filesystem)
if err != nil {
w.handleError(ctx, "reading link:", relPath, err, finishedChan)
handleError(ctx, "reading link:", relPath, err, finishedChan)
return nil
}
@ -556,7 +556,7 @@ func (w *walker) updateFileInfo(file, curFile protocol.FileInfo) protocol.FileIn
return file
}
func (w *walker) handleError(ctx context.Context, context, path string, err error, finishedChan chan<- ScanResult) {
func handleError(ctx context.Context, context, path string, err error, finishedChan chan<- ScanResult) {
// Ignore missing items, as deletions are not handled by the scanner.
if fs.IsNotExist(err) {
return