octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-08 23:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Do folder watch operations under lock (fixes #5392) (#5395)

Browse Source
This commit is contained in:
Simon Frei 2018-12-21 12:06:21 +01:00 committed by Jakob Borg
parent c3b3e02f21
commit fc81e2b3d7
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/model/folder.go
View File

@ -58,7 +58,7 @@ type folder struct {
watchChan chan []string watchChan chan []string
restartWatchChan chan struct{} restartWatchChan chan struct{}
watchErr error watchErr error
watchErrMut sync.Mutex watchMut sync.Mutex
puller puller puller puller
} }
@ -96,7 +96,7 @@ func newFolder(model *Model, cfg config.FolderConfiguration) folder {
watchCancel: func() {}, watchCancel: func() {},
restartWatchChan: make(chan struct{}, 1), restartWatchChan: make(chan struct{}, 1),
watchErrMut: sync.NewMutex(), watchMut: sync.NewMutex(),
} }
} }
@ -550,18 +550,18 @@ func (f *folder) scanTimerFired() {
} }
func (f *folder) WatchError() error { func (f *folder) WatchError() error {
f.watchErrMut.Lock() f.watchMut.Lock()
defer f.watchErrMut.Unlock() defer f.watchMut.Unlock()
return f.watchErr return f.watchErr
} }
// stopWatch immediately aborts watching and may be called asynchronously // stopWatch immediately aborts watching and may be called asynchronously
func (f *folder) stopWatch() { func (f *folder) stopWatch() {
f.watchMut.Lock()
f.watchCancel() f.watchCancel()
f.watchErrMut.Lock()
prevErr := f.watchErr prevErr := f.watchErr
f.watchErr = errWatchNotStarted f.watchErr = errWatchNotStarted
f.watchErrMut.Unlock() f.watchMut.Unlock()
if prevErr != errWatchNotStarted { if prevErr != errWatchNotStarted {
data := map[string]interface{}{ data := map[string]interface{}{
"folder": f.ID, "folder": f.ID,
@ -601,8 +601,10 @@ func (f *folder) startWatch() {
f.model.fmut.RLock() f.model.fmut.RLock()
ignores := f.model.folderIgnores[f.folderID] ignores := f.model.folderIgnores[f.folderID]
f.model.fmut.RUnlock() f.model.fmut.RUnlock()
f.watchMut.Lock()
f.watchChan = make(chan []string) f.watchChan = make(chan []string)
f.watchCancel = cancel f.watchCancel = cancel
f.watchMut.Unlock()
go f.startWatchAsync(ctx, ignores) go f.startWatchAsync(ctx, ignores)
} }
@ -614,10 +616,10 @@ func (f *folder) startWatchAsync(ctx context.Context, ignores *ignore.Matcher) {
select { select {
case <-timer.C: case <-timer.C:
eventChan, err := f.Filesystem().Watch(".", ignores, ctx, f.IgnorePerms) eventChan, err := f.Filesystem().Watch(".", ignores, ctx, f.IgnorePerms)
f.watchErrMut.Lock() f.watchMut.Lock()
prevErr := f.watchErr prevErr := f.watchErr
f.watchErr = err f.watchErr = err
f.watchErrMut.Unlock() f.watchMut.Unlock()
if err != prevErr { if err != prevErr {
data := map[string]interface{}{ data := map[string]interface{}{
"folder": f.ID, "folder": f.ID,
@ -639,6 +641,8 @@ func (f *folder) startWatchAsync(ctx context.Context, ignores *ignore.Matcher) {
timer.Reset(time.Minute) timer.Reset(time.Minute)
continue continue
} }
f.watchMut.Lock()
defer f.watchMut.Unlock()
watchaggregator.Aggregate(eventChan, f.watchChan, f.FolderConfiguration, f.model.cfg, ctx) watchaggregator.Aggregate(eventChan, f.watchChan, f.FolderConfiguration, f.model.cfg, ctx)
l.Debugln("Started filesystem watcher for folder", f.Description()) l.Debugln("Started filesystem watcher for folder", f.Description())
return return