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

Merge pull request #129755 from niranjandarshann/conmap

Browse Source 
Concurrentmap Iteration
This commit is contained in:
Kubernetes Prow Robot 2025-03-14 07:45:47 -07:00 committed by GitHub
commit afdc62eff5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/volume/plugins.go
View File

@ -637,9 +637,8 @@ func (pm *VolumePluginMgr) initProbedPlugin(probedPlugin VolumePlugin) error {
// specification. If no plugins can support or more than one plugin can // specification. If no plugins can support or more than one plugin can
// support it, return error. // support it, return error.
func (pm *VolumePluginMgr) FindPluginBySpec(spec *Spec) (VolumePlugin, error) { func (pm *VolumePluginMgr) FindPluginBySpec(spec *Spec) (VolumePlugin, error) {
pm.mutex.RLock() pm.mutex.Lock()
defer pm.mutex.RUnlock() defer pm.mutex.Unlock()
if spec == nil { if spec == nil {
return nil, fmt.Errorf("could not find plugin because volume spec is nil") return nil, fmt.Errorf("could not find plugin because volume spec is nil")
} }
@ -652,8 +651,8 @@ func (pm *VolumePluginMgr) FindPluginBySpec(spec *Spec) (VolumePlugin, error) {
matchedPluginNames = append(matchedPluginNames, v.GetPluginName()) matchedPluginNames = append(matchedPluginNames, v.GetPluginName())
} }
} }
pm.refreshProbedPlugins() pm.refreshProbedPlugins()
for _, plugin := range pm.probedPlugins { for _, plugin := range pm.probedPlugins {
if plugin.CanSupport(spec) { if plugin.CanSupport(spec) {
match = plugin match = plugin
@ -673,14 +672,13 @@ func (pm *VolumePluginMgr) FindPluginBySpec(spec *Spec) (VolumePlugin, error) {
// FindPluginByName fetches a plugin by name. If no plugin is found, returns error. // FindPluginByName fetches a plugin by name. If no plugin is found, returns error.
func (pm *VolumePluginMgr) FindPluginByName(name string) (VolumePlugin, error) { func (pm *VolumePluginMgr) FindPluginByName(name string) (VolumePlugin, error) {
pm.mutex.RLock() pm.mutex.Lock()
defer pm.mutex.RUnlock() defer pm.mutex.Unlock()
var match VolumePlugin var match VolumePlugin
if v, found := pm.plugins[name]; found { if v, found := pm.plugins[name]; found {
match = v match = v
} }
pm.refreshProbedPlugins() pm.refreshProbedPlugins()
if plugin, found := pm.probedPlugins[name]; found { if plugin, found := pm.probedPlugins[name]; found {
if match != nil { if match != nil {
@ -707,6 +705,7 @@ func (pm *VolumePluginMgr) refreshProbedPlugins() {
// because the probe function can return a list of valid plugins // because the probe function can return a list of valid plugins
// even when an error is present we still must add the plugins // even when an error is present we still must add the plugins
// or they will be skipped because each event only fires once // or they will be skipped because each event only fires once
for _, event := range events { for _, event := range events {
if event.Op == ProbeAddOrUpdate { if event.Op == ProbeAddOrUpdate {
if err := pm.initProbedPlugin(event.Plugin); err != nil { if err := pm.initProbedPlugin(event.Plugin); err != nil {