octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/scanner: Don't report error on missing items (fixes #5385) (#5387)

Browse Source
This commit is contained in:
Simon Frei 2018-12-17 14:52:15 +01:00 committed by GitHub
parent abb3fb8a31
commit c40c9a8d6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/scanner/walk.go
View File

@ -535,7 +535,12 @@ func (w *walker) updateFileInfo(file, curFile protocol.FileInfo) protocol.FileIn
file.LocalFlags = w.LocalFlags file.LocalFlags = w.LocalFlags
return file return file
} }
func (w *walker) handleError(ctx context.Context, context, path string, err error, finishedChan chan<- ScanResult) { func (w *walker) 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
}
l.Infof("Scanner (folder %s, file %q): %s: %v", w.Folder, path, context, err) l.Infof("Scanner (folder %s, file %q): %s: %v", w.Folder, path, context, err)
select { select {
case finishedChan <- ScanResult{ case finishedChan <- ScanResult{

17
lib/scanner/walk_test.go
View File

@ -738,6 +738,23 @@ func TestIssue4841(t *testing.T) {
} }
} }
// TestNotExistingError reproduces https://github.com/syncthing/syncthing/issues/5385
func TestNotExistingError(t *testing.T) {
sub := "notExisting"
if _, err := testFs.Lstat(sub); !fs.IsNotExist(err) {
t.Fatalf("Lstat returned error %v, while nothing should exist there.", err)
}
fchan := Walk(context.TODO(), Config{
Filesystem: testFs,
Subs: []string{sub},
Hashers: 2,
})
for f := range fchan {
t.Fatalf("Expected no result from scan, got %v", f)
}
}
// Verify returns nil or an error describing the mismatch between the block // Verify returns nil or an error describing the mismatch between the block
// list and actual reader contents // list and actual reader contents
func verify(r io.Reader, blocksize int, blocks []protocol.BlockInfo) error { func verify(r io.Reader, blocksize int, blocks []protocol.BlockInfo) error {