mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-10 07:11:08 +00:00
d6fbfc3545
The folder already knew how to stop properly, but the fs.Walk() didn't and can potentially take a very long time. This adds context support to Walk and the underlying scanning stuff, and passes in an appropriate context from above. The stop channel in model.folder is replaced with a context for this purpose. To test I added an infiniteFS that represents a large amount of data (not actually infinite, but close) and verify that walking it is properly stopped. For that to be implemented smoothly I moved out the Walk function to it's own type, as typically the implementer of a new filesystem type might not need or want to reimplement Walk. It's somewhat tricky to test that this actually works properly on the actual sendReceiveFolder and so on, as those are started from inside the model and the filesystem isn't easily pluggable etc. Instead I've tested that part manually by adding a huge folder and verifying that pause, resume and reconfig do the right things by looking at debug output. GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4117
89 lines
1.9 KiB
Go
89 lines
1.9 KiB
Go
// Copyright (C) 2014 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package model
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/syncthing/syncthing/lib/config"
|
|
"github.com/syncthing/syncthing/lib/fs"
|
|
"github.com/syncthing/syncthing/lib/versioner"
|
|
)
|
|
|
|
func init() {
|
|
folderFactories[config.FolderTypeSendOnly] = newSendOnlyFolder
|
|
}
|
|
|
|
type sendOnlyFolder struct {
|
|
folder
|
|
config.FolderConfiguration
|
|
}
|
|
|
|
func newSendOnlyFolder(model *Model, cfg config.FolderConfiguration, _ versioner.Versioner, _ *fs.MtimeFS) service {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
return &sendOnlyFolder{
|
|
folder: folder{
|
|
stateTracker: newStateTracker(cfg.ID),
|
|
scan: newFolderScanner(cfg),
|
|
ctx: ctx,
|
|
cancel: cancel,
|
|
model: model,
|
|
initialScanFinished: make(chan struct{}),
|
|
},
|
|
FolderConfiguration: cfg,
|
|
}
|
|
}
|
|
|
|
func (f *sendOnlyFolder) Serve() {
|
|
l.Debugln(f, "starting")
|
|
defer l.Debugln(f, "exiting")
|
|
|
|
defer func() {
|
|
f.scan.timer.Stop()
|
|
}()
|
|
|
|
for {
|
|
select {
|
|
case <-f.ctx.Done():
|
|
return
|
|
|
|
case <-f.scan.timer.C:
|
|
l.Debugln(f, "Scanning subdirectories")
|
|
err := f.scanSubdirs(nil)
|
|
|
|
select {
|
|
case <-f.initialScanFinished:
|
|
default:
|
|
status := "Completed"
|
|
if err != nil {
|
|
status = "Failed"
|
|
}
|
|
l.Infoln(status, "initial scan (ro) of", f.Description())
|
|
close(f.initialScanFinished)
|
|
}
|
|
|
|
if f.scan.HasNoInterval() {
|
|
continue
|
|
}
|
|
|
|
f.scan.Reschedule()
|
|
|
|
case req := <-f.scan.now:
|
|
req.err <- f.scanSubdirs(req.subdirs)
|
|
|
|
case next := <-f.scan.delay:
|
|
f.scan.timer.Reset(next)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (f *sendOnlyFolder) String() string {
|
|
return fmt.Sprintf("sendOnlyFolder/%s@%p", f.folderID, f)
|
|
}
|