Skip to content

Commit

Permalink
Merge pull request #74050 from huynq0911/fix_error_collide_package
Browse files Browse the repository at this point in the history
Fix error collides with imported package name and log warning
  • Loading branch information
k8s-ci-robot committed Feb 15, 2019
2 parents 763042e + 7c923b6 commit 97f5266
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions pkg/scheduler/factory/plugins.go
Expand Up @@ -412,23 +412,23 @@ func getFitPredicateFunctions(names sets.String, args PluginFactoryArgs) (map[st
schedulerFactoryMutex.Lock()
defer schedulerFactoryMutex.Unlock()

predicates := map[string]predicates.FitPredicate{}
fitPredicates := map[string]predicates.FitPredicate{}
for _, name := range names.List() {
factory, ok := fitPredicateMap[name]
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.
for name := range mandatoryFitPredicates {
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) {
Expand All @@ -455,11 +455,11 @@ func getPriorityFunctionConfigs(names sets.String, args PluginFactoryArgs) ([]pr
schedulerFactoryMutex.Lock()
defer schedulerFactoryMutex.Unlock()

configs := []priorities.PriorityConfig{}
var configs []priorities.PriorityConfig
for _, name := range names.List() {
factory, ok := priorityFunctionMap[name]
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 {
configs = append(configs, priorities.PriorityConfig{
Expand Down Expand Up @@ -489,7 +489,7 @@ func validateSelectedConfigs(configs []priorities.PriorityConfig) error {
for _, config := range configs {
// Checks totalPriority against MaxTotalPriority to avoid overflow
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
}
Expand Down Expand Up @@ -542,7 +542,7 @@ func ListRegisteredFitPredicates() []string {
schedulerFactoryMutex.Lock()
defer schedulerFactoryMutex.Unlock()

names := []string{}
var names []string
for name := range fitPredicateMap {
names = append(names, name)
}
Expand All @@ -554,7 +554,7 @@ func ListRegisteredPriorityFunctions() []string {
schedulerFactoryMutex.Lock()
defer schedulerFactoryMutex.Unlock()

names := []string{}
var names []string
for name := range priorityFunctionMap {
names = append(names, name)
}
Expand Down

0 comments on commit 97f5266

Please sign in to comment.