github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup locking in configz

Browse Source 
- Reduce scope of lock in write() method
- User read lock in write() method
This commit is contained in:
Mikhail Mazurskiy 2017-08-12 17:24:32 +10:00
parent c1da492ad2
commit 7e7a811717
No known key found for this signature in database
GPG Key ID: 93551ECC96E2F568
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/util/configz/configz.go
View File

@ -75,9 +75,13 @@ func handle(w http.ResponseWriter, r *http.Request) {
}
func write(w io.Writer) error {
configsGuard.Lock()
defer configsGuard.Unlock()
b, err := json.Marshal(configs)
var b []byte
var err error
func() {
configsGuard.RLock()
defer configsGuard.RUnlock()
b, err = json.Marshal(configs)
}()
if err != nil {
return fmt.Errorf("error marshaling json: %v", err)
}