github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #70053 from gman0/fix-csiclient-lock

Browse Source 
CSI client: added missing lock when reading from csiDrivers
This commit is contained in:
k8s-ci-robot 2018-10-23 02:08:32 -07:00 committed by GitHub
commit 322d0df3d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/volume/csi/csi_client.go
View File

@ -321,7 +321,10 @@ func newGrpcConn(driverName string) (*grpc.ClientConn, error) {
addr := fmt.Sprintf(csiAddrTemplate, driverName) addr := fmt.Sprintf(csiAddrTemplate, driverName)
// TODO once KubeletPluginsWatcher graduates to beta, remove FeatureGate check // TODO once KubeletPluginsWatcher graduates to beta, remove FeatureGate check
if utilfeature.DefaultFeatureGate.Enabled(features.KubeletPluginsWatcher) { if utilfeature.DefaultFeatureGate.Enabled(features.KubeletPluginsWatcher) {
csiDrivers.RLock()
driver, ok := csiDrivers.driversMap[driverName] driver, ok := csiDrivers.driversMap[driverName]
csiDrivers.RUnlock()
if !ok { if !ok {
return nil, fmt.Errorf("driver name %s not found in the list of registered CSI drivers", driverName) return nil, fmt.Errorf("driver name %s not found in the list of registered CSI drivers", driverName)
} }