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

Merge pull request #77838 from tedyu/matched-plugin

Browse Source 
Move the array of plugin names to inside the last if block in VolumePluginMgr#FindPluginBySpec
This commit is contained in:
Kubernetes Prow Robot 2019-05-13 19:47:21 -07:00 committed by GitHub
commit ca9347f535
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/volume/plugins.go
View File

@ -647,19 +647,16 @@ func (pm *VolumePluginMgr) FindPluginBySpec(spec *Spec) (VolumePlugin, error) {
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")
} }
matchedPluginNames := []string{}
matches := []VolumePlugin{} matches := []VolumePlugin{}
for k, v := range pm.plugins { for _, v := range pm.plugins {
if v.CanSupport(spec) { if v.CanSupport(spec) {
matchedPluginNames = append(matchedPluginNames, k)
matches = append(matches, v) matches = append(matches, v)
} }
} }
pm.refreshProbedPlugins() pm.refreshProbedPlugins()
for pluginName, plugin := range pm.probedPlugins { for _, plugin := range pm.probedPlugins {
if plugin.CanSupport(spec) { if plugin.CanSupport(spec) {
matchedPluginNames = append(matchedPluginNames, pluginName)
matches = append(matches, plugin) matches = append(matches, plugin)
} }
} }
@ -668,6 +665,10 @@ func (pm *VolumePluginMgr) FindPluginBySpec(spec *Spec) (VolumePlugin, error) {
return nil, fmt.Errorf("no volume plugin matched") return nil, fmt.Errorf("no volume plugin matched")
} }
if len(matches) > 1 { 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, ",")) return nil, fmt.Errorf("multiple volume plugins matched: %s", strings.Join(matchedPluginNames, ","))
} }
return matches[0], nil return matches[0], nil
@ -684,11 +685,9 @@ func (pm *VolumePluginMgr) IsPluginMigratableBySpec(spec *Spec) (bool, error) {
return false, fmt.Errorf("could not find if plugin is migratable because volume spec is nil") return false, fmt.Errorf("could not find if plugin is migratable because volume spec is nil")
} }
matchedPluginNames := []string{}
matches := []VolumePlugin{} matches := []VolumePlugin{}
for k, v := range pm.plugins { for _, v := range pm.plugins {
if v.CanSupport(spec) { if v.CanSupport(spec) {
matchedPluginNames = append(matchedPluginNames, k)
matches = append(matches, v) matches = append(matches, v)
} }
} }
@ -698,6 +697,10 @@ func (pm *VolumePluginMgr) IsPluginMigratableBySpec(spec *Spec) (bool, error) {
return false, nil return false, nil
} }
if len(matches) > 1 { if len(matches) > 1 {
matchedPluginNames := []string{}
for _, plugin := range matches {
matchedPluginNames = append(matchedPluginNames, plugin.GetPluginName())
}
return false, fmt.Errorf("multiple volume plugins matched: %s", strings.Join(matchedPluginNames, ",")) return false, fmt.Errorf("multiple volume plugins matched: %s", strings.Join(matchedPluginNames, ","))
} }
@ -711,16 +714,13 @@ func (pm *VolumePluginMgr) FindPluginByName(name string) (VolumePlugin, error) {
defer pm.mutex.Unlock() defer pm.mutex.Unlock()
// 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.
matchedPluginNames := []string{}
matches := []VolumePlugin{} matches := []VolumePlugin{}
if v, found := pm.plugins[name]; found { if v, found := pm.plugins[name]; found {
matchedPluginNames = append(matchedPluginNames, name)
matches = append(matches, v) matches = append(matches, v)
} }
pm.refreshProbedPlugins() pm.refreshProbedPlugins()
if plugin, found := pm.probedPlugins[name]; found { if plugin, found := pm.probedPlugins[name]; found {
matchedPluginNames = append(matchedPluginNames, name)
matches = append(matches, plugin) matches = append(matches, plugin)
} }
@ -728,6 +728,10 @@ func (pm *VolumePluginMgr) FindPluginByName(name string) (VolumePlugin, error) {
return nil, fmt.Errorf("no volume plugin matched") return nil, fmt.Errorf("no volume plugin matched")
} }
if len(matches) > 1 { 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, ",")) return nil, fmt.Errorf("multiple volume plugins matched: %s", strings.Join(matchedPluginNames, ","))
} }
return matches[0], nil return matches[0], nil