From 7c923b64d837a519d78f4e21cb0b1099cac20011 Mon Sep 17 00:00:00 2001
From: Nguyen Quang Huy <huynq0911@gmail.com>
Date: Thu, 14 Feb 2019 09:17:54 +0700
Subject: [PATCH] Fix error collides with imported package name

Fix error collides with imported package name for plugins.go
- Fix variable 'preds' collides with imported package name
- Fix warning in initializing variables, error string log be capitalized
---
 pkg/scheduler/factory/plugins.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/scheduler/factory/plugins.go b/pkg/scheduler/factory/plugins.go
index b5127aba55..e6db5d106d 100644
--- a/pkg/scheduler/factory/plugins.go
+++ b/pkg/scheduler/factory/plugins.go
@@ -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) {
@@ -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{
@@ -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
 	}
@@ -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)
 	}
@@ -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)
 	}