lib/model: Less locking in ClusterConfig (syncthing#5943)

imsodin · calmh · commit 86e35f187965 · 2019-08-11T19:30:24.000+02:00
diff --git a/lib/model/model.go b/lib/model/model.go
@@ -1062,8 +1062,7 @@ func (m *model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
 		}
 	}
 
-	m.fmut.Lock()
-	defer m.fmut.Unlock()
+	m.fmut.RLock()
 	var paused []string
 	for _, folder := range cm.Folders {
 		cfg, ok := m.cfg.Folder(folder.ID)
@@ -1184,6 +1183,7 @@ func (m *model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
 		// implementing suture.IsCompletable).
 		m.Add(is)
 	}
+	m.fmut.RUnlock()
 
 	m.pmut.Lock()
 	m.remotePausedFolders[deviceID] = paused

Original file line number	Diff line number	Diff line change
`@@ -1062,8 +1062,7 @@ func (m *model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon`
`1062`	`1062`	`}`
`1063`	`1063`	`}`
`1064`	`1064`
`1065`		`- m.fmut.Lock()`
`1066`		`- defer m.fmut.Unlock()`
	`1065`	`+ m.fmut.RLock()`
`1067`	`1066`	`var paused []string`
`1068`	`1067`	`for _, folder := range cm.Folders {`
`1069`	`1068`	`cfg, ok := m.cfg.Folder(folder.ID)`
`@@ -1184,6 +1183,7 @@ func (m *model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon`
`1184`	`1183`	`// implementing suture.IsCompletable).`
`1185`	`1184`	`m.Add(is)`
`1186`	`1185`	`}`
	`1186`	`+ m.fmut.RUnlock()`
`1187`	`1187`
`1188`	`1188`	`m.pmut.Lock()`
`1189`	`1189`	`m.remotePausedFolders[deviceID] = paused`