octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-10 15:20:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1885 from AudriusButkevicius/moar-checks

Browse Source 
Additional cases for detecting folders disappearing
This commit is contained in:
Jakob Borg 2015-06-03 08:40:21 +02:00
commit 25b25b5434
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/model/model.go
View File

@ -1303,6 +1303,7 @@ nextSub:
batch = batch[:0] batch = batch[:0]
// TODO: We should limit the Have scanning to start at sub // TODO: We should limit the Have scanning to start at sub
seenPrefix := false seenPrefix := false
var iterError error
fs.WithHaveTruncated(protocol.LocalDeviceID, func(fi db.FileIntf) bool { fs.WithHaveTruncated(protocol.LocalDeviceID, func(fi db.FileIntf) bool {
f := fi.(db.FileInfoTruncated) f := fi.(db.FileInfoTruncated)
hasPrefix := len(subs) == 0 hasPrefix := len(subs) == 0
@ -1326,6 +1327,10 @@ nextSub:
} }
if len(batch) == batchSizeFiles { if len(batch) == batchSizeFiles {
if err := m.CheckFolderHealth(folder); err != nil {
iterError = err
return false
}
m.updateLocals(folder, batch) m.updateLocals(folder, batch)
batch = batch[:0] batch = batch[:0]
} }
@ -1363,7 +1368,16 @@ nextSub:
} }
return true return true
}) })
if len(batch) > 0 {
if iterError != nil {
l.Infof("Stopping folder %s mid-scan due to folder error: %s", folder, iterError)
return iterError
}
if err := m.CheckFolderHealth(folder); err != nil {
l.Infof("Stopping folder %s mid-scan due to folder error: %s", folder, err)
return err
} else if len(batch) > 0 {
m.updateLocals(folder, batch) m.updateLocals(folder, batch)
} }