github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup FindPluginByName() in VolumePluginMgr

Browse Source 
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update typo

Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update import

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
This commit is contained in:
PingWang 2021-11-02 11:17:46 +08:00
parent 349758d65d
commit 075adb308d
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/volume/plugins.go
View File

@ -706,30 +706,26 @@ func (pm *VolumePluginMgr) FindPluginByName(name string) (VolumePlugin, error) {
defer pm.mutex.RUnlock() defer pm.mutex.RUnlock()
// Once we can get rid of legacy names we can reduce this to a map lookup. // Once we can get rid of legacy names we can reduce this to a map lookup.
matches := []VolumePlugin{} var match VolumePlugin
if v, found := pm.plugins[name]; found { if v, found := pm.plugins[name]; found {
matches = append(matches, v) match = v
} }
pm.refreshProbedPlugins() pm.refreshProbedPlugins()
if plugin, found := pm.probedPlugins[name]; found { if plugin, found := pm.probedPlugins[name]; found {
matches = append(matches, plugin) if match != nil {
return nil, fmt.Errorf("multiple volume plugins matched: %s and %s", match.GetPluginName(), plugin.GetPluginName())
}
match = plugin
} }
if len(matches) == 0 { if match == nil {
return nil, fmt.Errorf("no volume plugin matched name: %s", name) return nil, fmt.Errorf("no volume plugin matched name: %s", name)
} }
if len(matches) > 1 {
matchedPluginNames := []string{}
for _, plugin := range matches {
matchedPluginNames = append(matchedPluginNames, plugin.GetPluginName())
}
return nil, fmt.Errorf("multiple volume plugins matched: %s", strings.Join(matchedPluginNames, ","))
}
// Issue warning if the matched provider is deprecated // Issue warning if the matched provider is deprecated
pm.logDeprecation(matches[0].GetPluginName()) pm.logDeprecation(match.GetPluginName())
return matches[0], nil return match, nil
} }
// logDeprecation logs warning when a deprecated plugin is used. // logDeprecation logs warning when a deprecated plugin is used.