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

lib/model: Handle concurrently removed device in ClusterConfig (#6666)

Browse Source
This commit is contained in:
Simon Frei 2020-05-20 11:13:55 +02:00 committed by GitHub
parent 8343db6766
commit cf75329067
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/model/model.go
View File

@ -956,7 +956,11 @@ func (m *model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
} }
changed := false changed := false
deviceCfg := m.cfg.Devices()[deviceID] deviceCfg, ok := m.cfg.Devices()[deviceID]
if !ok {
l.Debugln("Device disappeared from config while processing cluster-config")
return errDeviceUnknown
}
// Needs to happen outside of the fmut, as can cause CommitConfiguration // Needs to happen outside of the fmut, as can cause CommitConfiguration
if deviceCfg.AutoAcceptFolders { if deviceCfg.AutoAcceptFolders {