felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

lib/model: Close conns when devices are removed (fixes #6564) (#6641)

Browse Source
This commit is contained in:
Simon Frei
2020-05-14 07:50:53 +02:00
committed by GitHub
parent 299b9d8883
commit e5cc55ce09
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/model/model.go
+4
View File
@@ -164,6 +164,7 @@ var (
errDeviceUnknown = errors.New("unknown device") errDeviceUnknown = errors.New("unknown device")
errDevicePaused = errors.New("device is paused") errDevicePaused = errors.New("device is paused")
errDeviceIgnored = errors.New("device is ignored") errDeviceIgnored = errors.New("device is ignored")
errDeviceRemoved = errors.New("device has been removed")
ErrFolderPaused = errors.New("folder is paused") ErrFolderPaused = errors.New("folder is paused")
errFolderNotRunning = errors.New("folder is not running") errFolderNotRunning = errors.New("folder is not running")
errFolderMissing = errors.New("no such folder") errFolderMissing = errors.New("no such folder")
@@ -2482,11 +2483,14 @@ func (m *model) CommitConfiguration(from, to config.Configuration) bool {
m.evLogger.Log(events.DeviceResumed, map[string]string{"device": deviceID.String()}) m.evLogger.Log(events.DeviceResumed, map[string]string{"device": deviceID.String()})
} }
} }
removedDevices := make([]protocol.DeviceID, 0, len(fromDevices))
m.fmut.Lock() m.fmut.Lock()
for deviceID := range fromDevices { for deviceID := range fromDevices {
delete(m.deviceStatRefs, deviceID) delete(m.deviceStatRefs, deviceID)
removedDevices = append(removedDevices, deviceID)
} }
m.fmut.Unlock() m.fmut.Unlock()
m.closeConns(removedDevices, errDeviceRemoved)
m.globalRequestLimiter.setCapacity(1024 * to.Options.MaxConcurrentIncomingRequestKiB()) m.globalRequestLimiter.setCapacity(1024 * to.Options.MaxConcurrentIncomingRequestKiB())
m.folderIOLimiter.setCapacity(to.Options.MaxFolderConcurrency()) m.folderIOLimiter.setCapacity(to.Options.MaxFolderConcurrency())