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

lib/model: Create new file-set after stopping folder (fixes #5882) (#5883)

Browse Source
This commit is contained in:
Simon Frei 2019-07-23 20:39:25 +02:00 committed by Jakob Borg
parent 5de9b677c2
commit 35f40e9a58
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/model/model.go
View File

@ -459,18 +459,16 @@ func (m *model) RestartFolder(from, to config.FolderConfiguration) {
errMsg = "restarting" errMsg = "restarting"
} }
var fset *db.FileSet
if !to.Paused {
// Creating the fileset can take a long time (metadata calculation)
// so we do it outside of the lock.
fset = db.NewFileSet(to.ID, to.Filesystem(), m.db)
}
m.fmut.Lock() m.fmut.Lock()
defer m.fmut.Unlock() defer m.fmut.Unlock()
m.tearDownFolderLocked(from, fmt.Errorf("%v folder %v", errMsg, to.Description())) m.tearDownFolderLocked(from, fmt.Errorf("%v folder %v", errMsg, to.Description()))
if !to.Paused { if !to.Paused {
// Creating the fileset can take a long time (metadata calculation)
// so we do it outside of the lock.
m.fmut.Unlock()
fset := db.NewFileSet(to.ID, to.Filesystem(), m.db)
m.fmut.Lock()
m.addFolderLocked(to, fset) m.addFolderLocked(to, fset)
m.startFolderLocked(to) m.startFolderLocked(to)
} }