Merge pull request #50550 from atlassian/cleanup-configz

Automatic merge from submit-queue (batch tested with PRs 50550, 50768) Cleanup locking in configz **What this PR does / why we need it**: - Reduce scope of lock in `write()` method - Use the read lock in `write()` method **Release note**: ```release-note NONE ``` /kind cleanup @mikedanese p.s. looks like the `Set()` method could be removed if the value is accepted as an argument to `New()`. I.e. looks like to code re-sets the value.

Merge pull request #50550 from atlassian/cleanup-configz
a4acc38c · Kubernetes Submit Queue · GitHub · 402e48b0 · 7e7a8117 · a4acc38c
Commit a4acc38c authored Aug 17, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

configz.go pkg/util/configz/configz.go +7 -3

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