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

lib/model: NewFileSet outside fmut (#5818)

Browse Source
This commit is contained in:
Simon Frei 2019-06-29 08:49:30 +02:00 committed by Jakob Borg
parent b58f6ca886
commit 1cf352a722
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/model/model.go
View File

@ -370,17 +370,20 @@ func (m *model) AddFolder(cfg config.FolderConfiguration) {
panic("cannot add empty folder path") panic("cannot add empty folder path")
} }
// Creating the fileset can take a long time (metadata calculation) so
// we do it outside of the lock.
fset := db.NewFileSet(cfg.ID, cfg.Filesystem(), m.db)
m.fmut.Lock() m.fmut.Lock()
defer m.fmut.Unlock() defer m.fmut.Unlock()
m.addFolderLocked(cfg) m.addFolderLocked(cfg, fset)
} }
func (m *model) addFolderLocked(cfg config.FolderConfiguration) { func (m *model) addFolderLocked(cfg config.FolderConfiguration, fset *db.FileSet) {
m.folderCfgs[cfg.ID] = cfg m.folderCfgs[cfg.ID] = cfg
folderFs := cfg.Filesystem() m.folderFiles[cfg.ID] = fset
m.folderFiles[cfg.ID] = db.NewFileSet(cfg.ID, folderFs, m.db)
ignores := ignore.New(folderFs, ignore.WithCache(m.cacheIgnoredFiles)) ignores := ignore.New(cfg.Filesystem(), ignore.WithCache(m.cacheIgnoredFiles))
if err := ignores.Load(".stignore"); err != nil && !fs.IsNotExist(err) { if err := ignores.Load(".stignore"); err != nil && !fs.IsNotExist(err) {
l.Warnln("Loading ignores:", err) l.Warnln("Loading ignores:", err)
} }
@ -458,12 +461,19 @@ 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 {
m.addFolderLocked(to) m.addFolderLocked(to, fset)
m.startFolderLocked(to) m.startFolderLocked(to)
} }
l.Infof("%v folder %v (%v)", infoMsg, to.Description(), to.Type) l.Infof("%v folder %v (%v)", infoMsg, to.Description(), to.Type)