octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 19:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/watchaggregator: Prevent race on config update (#4938)

Browse Source
This commit is contained in:
Simon Frei 2018-05-24 20:47:15 +02:00 committed by Audrius Butkevicius
parent ef1633ac76
commit 07bf24a3b4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/watchaggregator/aggregator.go
View File

@ -98,6 +98,9 @@ func (dir *eventDir) eventType() fs.EventType {
} }
type aggregator struct { type aggregator struct {
// folderID never changes and is accessed in CommitConfiguration, which
// asynchronously updates folderCfg -> can't use folderCfg.ID (racy)
folderID string
folderCfg config.FolderConfiguration folderCfg config.FolderConfiguration
folderCfgUpdate chan config.FolderConfiguration folderCfgUpdate chan config.FolderConfiguration
// Time after which an event is scheduled for scanning when no modifications occur. // Time after which an event is scheduled for scanning when no modifications occur.
@ -112,6 +115,7 @@ type aggregator struct {
func newAggregator(folderCfg config.FolderConfiguration, ctx context.Context) *aggregator { func newAggregator(folderCfg config.FolderConfiguration, ctx context.Context) *aggregator {
a := &aggregator{ a := &aggregator{
folderID: folderCfg.ID,
folderCfgUpdate: make(chan config.FolderConfiguration), folderCfgUpdate: make(chan config.FolderConfiguration),
notifyTimerNeedsReset: false, notifyTimerNeedsReset: false,
notifyTimerResetChan: make(chan time.Duration), notifyTimerResetChan: make(chan time.Duration),
@ -390,7 +394,7 @@ func (a *aggregator) VerifyConfiguration(from, to config.Configuration) error {
func (a *aggregator) CommitConfiguration(from, to config.Configuration) bool { func (a *aggregator) CommitConfiguration(from, to config.Configuration) bool {
for _, folderCfg := range to.Folders { for _, folderCfg := range to.Folders {
if folderCfg.ID == a.folderCfg.ID { if folderCfg.ID == a.folderID {
select { select {
case a.folderCfgUpdate <- folderCfg: case a.folderCfgUpdate <- folderCfg:
case <-a.ctx.Done(): case <-a.ctx.Done():