Merge pull request #50098 from nikhita/crd-data-race

Automatic merge from submit-queue (batch tested with PRs 46685, 49863, 50098, 50070, 50096) apiextensions: fix data race in storage Fixes data race in CRD storage. Copy to a new map because we cannot write to storageMap without a race as it is used without locking elsewhere. **Release note**: ```release-note NONE ``` /cc @sttts

Merge pull request #50098 from nikhita/crd-data-race
c66d2499 · Kubernetes Submit Queue · GitHub · 6065a0da · 4a08a693 · c66d2499
Commit c66d2499 authored Aug 04, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

customresource_handler.go ...ensions-apiserver/pkg/apiserver/customresource_handler.go +11 -2

No files found.
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
@@ -343,8 +343,17 @@ func (r *crdHandler) getServingInfoFor(crd *apiextensions.CustomResourceDefiniti
 		storage:      storage,
 		requestScope: requestScope,
 	}
-	storageMap[crd.UID] = ret
-	r.customStorage.Store(storageMap)
+	storageMap2 := make(crdStorageMap, len(storageMap))
+	// Copy because we cannot write to storageMap without a race
+	// as it is used without locking elsewhere
+	for k, v := range storageMap {
+		storageMap2[k] = v
+	}
+	storageMap2[crd.UID] = ret
+	r.customStorage.Store(storageMap2)
 	return ret
 }