github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74050 from huynq0911/fix_error_collide_package 

Fix error collides with imported package name and log warning
pull/564/head
Kubernetes Prow Robot 2019-02-15 05:28:11 -08:00 committed by GitHub
parent 763042e938 7c923b64d8
commit 97f526665b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/scheduler/factory/plugins.go
View File

@ -412,23 +412,23 @@ func getFitPredicateFunctions(names sets.String, args PluginFactoryArgs) (map[st
schedulerFactoryMutex.Lock() schedulerFactoryMutex.Lock()
defer schedulerFactoryMutex.Unlock() defer schedulerFactoryMutex.Unlock()
predicates := map[string]predicates.FitPredicate{} fitPredicates := map[string]predicates.FitPredicate{}
for _, name := range names.List() { for _, name := range names.List() {
factory, ok := fitPredicateMap[name] factory, ok := fitPredicateMap[name]
if !ok { if !ok {
return nil, fmt.Errorf("Invalid predicate name %q specified - no corresponding function found", name) return nil, fmt.Errorf("invalid predicate name %q specified - no corresponding function found", name)
} }
predicates[name] = factory(args) fitPredicates[name] = factory(args)
} }
// Always include mandatory fit predicates. // Always include mandatory fit predicates.
for name := range mandatoryFitPredicates { for name := range mandatoryFitPredicates {
if factory, found := fitPredicateMap[name]; found { if factory, found := fitPredicateMap[name]; found {
predicates[name] = factory(args) fitPredicates[name] = factory(args)
} }
} }
return predicates, nil return fitPredicates, nil
} }
func getPriorityMetadataProducer(args PluginFactoryArgs) (priorities.PriorityMetadataProducer, error) { func getPriorityMetadataProducer(args PluginFactoryArgs) (priorities.PriorityMetadataProducer, error) {
@ -455,11 +455,11 @@ func getPriorityFunctionConfigs(names sets.String, args PluginFactoryArgs) ([]pr
schedulerFactoryMutex.Lock() schedulerFactoryMutex.Lock()
defer schedulerFactoryMutex.Unlock() defer schedulerFactoryMutex.Unlock()
configs := []priorities.PriorityConfig{} var configs []priorities.PriorityConfig
for _, name := range names.List() { for _, name := range names.List() {
factory, ok := priorityFunctionMap[name] factory, ok := priorityFunctionMap[name]
if !ok { if !ok {
return nil, fmt.Errorf("Invalid priority name %s specified - no corresponding function found", name) return nil, fmt.Errorf("invalid priority name %s specified - no corresponding function found", name)
} }
if factory.Function != nil { if factory.Function != nil {
configs = append(configs, priorities.PriorityConfig{ configs = append(configs, priorities.PriorityConfig{
@ -489,7 +489,7 @@ func validateSelectedConfigs(configs []priorities.PriorityConfig) error {
for _, config := range configs { for _, config := range configs {
// Checks totalPriority against MaxTotalPriority to avoid overflow // Checks totalPriority against MaxTotalPriority to avoid overflow
if config.Weight*schedulerapi.MaxPriority > schedulerapi.MaxTotalPriority-totalPriority { if config.Weight*schedulerapi.MaxPriority > schedulerapi.MaxTotalPriority-totalPriority {
return fmt.Errorf("Total priority of priority functions has overflown") return fmt.Errorf("total priority of priority functions has overflown")
} }
totalPriority += config.Weight * schedulerapi.MaxPriority totalPriority += config.Weight * schedulerapi.MaxPriority
} }
@ -542,7 +542,7 @@ func ListRegisteredFitPredicates() []string {
schedulerFactoryMutex.Lock() schedulerFactoryMutex.Lock()
defer schedulerFactoryMutex.Unlock() defer schedulerFactoryMutex.Unlock()
names := []string{} var names []string
for name := range fitPredicateMap { for name := range fitPredicateMap {
names = append(names, name) names = append(names, name)
} }
@ -554,7 +554,7 @@ func ListRegisteredPriorityFunctions() []string {
schedulerFactoryMutex.Lock() schedulerFactoryMutex.Lock()
defer schedulerFactoryMutex.Unlock() defer schedulerFactoryMutex.Unlock()
names := []string{} var names []string
for name := range priorityFunctionMap { for name := range priorityFunctionMap {
names = append(names, name) names = append(names, name)
} }