Skip to content

K
k3s
Unverified Commit 322d0df3 authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub
Browse files
Options

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

CSI client: added missing lock when reading from csiDrivers
parents b1fbdfe7 571ad40f
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
pkg/volume/csi/csi_client.go
View file @ 322d0df3
...@@ -321,7 +321,10 @@ func newGrpcConn(driverName string) (*grpc.ClientConn, error) { ...@@ -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)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment