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: Fix locking when resending cluster-configs (#7107)

Browse Source
This commit is contained in:
Simon Frei 2020-11-09 14:05:21 +01:00 committed by GitHub
parent 326111d10f
commit 54643e86b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/model/model.go
View File

@ -2375,13 +2375,18 @@ func (m *model) CommitConfiguration(from, to config.Configuration) bool {
go conn.Close(errDeviceRemoved) go conn.Close(errDeviceRemoved)
} }
} }
ccConns := make([]protocol.Connection, 0, len(clusterConfigDevices))
for id := range clusterConfigDevices { for id := range clusterConfigDevices {
if conn, ok := m.conn[id]; ok { if conn, ok := m.conn[id]; ok {
cm := m.generateClusterConfig(conn.ID()) ccConns = append(ccConns, conn)
go conn.ClusterConfig(cm)
} }
} }
m.pmut.RUnlock() m.pmut.RUnlock()
// Generating cluster-configs acquires fmut -> must happen outside of pmut.
for _, conn := range ccConns {
cm := m.generateClusterConfig(conn.ID())
go conn.ClusterConfig(cm)
}
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())