perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Mark initial scan as finished even if failed and refactor (fixes #4103)

Browse Source 
The mechanism to disallow manual scans before the initial scan completed
(#3996) , had the side effect, that if the initial scan failed, no further
scans are allowed. So this marks the initial scan as finished regardless of
whether it succeeded or not.

There was also redundant code in rofolder and a pointless check for folder
health in scanSubsIfHealthy (happens in internalScanFolderSubdirs as well).
This also moves logging from folder.go to ro/rw-folder.go to include the
information about whether it is send-only or send-receive

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4104
This commit is contained in:
Simon Frei
2017-04-20 00:20:34 +00:00
committed by Jakob Borg
parent 57e3f9e64b
commit 6b188ebcf3
4 changed files with 41 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/model/rofolder.go
View File

@@ -26,11 +26,11 @@ type sendOnlyFolder struct {
func newSendOnlyFolder(model *Model, cfg config.FolderConfiguration, _ versioner.Versioner, _ *fs.MtimeFS) service {
return &sendOnlyFolder{
folder: folder{
stateTracker: newStateTracker(cfg.ID),
scan: newFolderScanner(cfg),
stop: make(chan struct{}),
model: model,
initialScanCompleted: make(chan struct{}),
stateTracker: newStateTracker(cfg.ID),
scan: newFolderScanner(cfg),
stop: make(chan struct{}),
model: model,
initialScanFinished: make(chan struct{}),
},
FolderConfiguration: cfg,
}
@@ -50,29 +50,18 @@ func (f *sendOnlyFolder) Serve() {
return
case <-f.scan.timer.C:
if err := f.model.CheckFolderHealth(f.folderID); err != nil {
l.Infoln("Skipping scan of", f.Description(), "due to folder error:", err)
f.scan.Reschedule()
continue
}
l.Debugln(f, "rescan")
if err := f.model.internalScanFolderSubdirs(f.folderID, nil); err != nil {
// Potentially sets the error twice, once in the scanner just
// by doing a check, and once here, if the error returned is
// the same one as returned by CheckFolderHealth, though
// duplicate set is handled by setError.
f.setError(err)
f.scan.Reschedule()
continue
}
l.Debugln(f, "Scanning subdirectories")
err := f.scanSubdirs(nil)
select {
case <-f.initialScanCompleted:
case <-f.initialScanFinished:
default:
l.Infoln("Completed initial scan (ro) of", f.Description())
close(f.initialScanCompleted)
status := "Completed"
if err != nil {
status = "Failed"
}
l.Infoln(status, "initial scan (ro) of", f.Description())
close(f.initialScanFinished)
}
if f.scan.HasNoInterval() {
@@ -82,7 +71,7 @@ func (f *sendOnlyFolder) Serve() {
f.scan.Reschedule()
case req := <-f.scan.now:
req.err <- f.scanSubdirsIfHealthy(req.subdirs)
req.err <- f.scanSubdirs(req.subdirs)
case next := <-f.scan.delay:
f.scan.timer.Reset(next)