Achilleas Tzenetopoulos пре 5 година
родитељ
комит
d6418ba615

+ 1 - 1
kubernetes-v1.15.4/pkg/scheduler/factory/factory.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"time"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"

+ 30 - 28
kubernetes-v1.15.4/pkg/scheduler/factory/plugins.go

@@ -63,13 +63,15 @@ type FitPredicateFactory func(PluginFactoryArgs) predicates.FitPredicate
 // DEPRECATED
 // Use Map-Reduce pattern for priority functions.
 type PriorityFunctionFactory func(PluginFactoryArgs) priorities.PriorityFunction
-type CustomPriorityFunctionFactory func(PluginFactoryArgs) priorities.CustomPriorityFunction
+
+//type CustomPriorityFunctionFactory func(PluginFactoryArgs) priorities.CustomPriorityFunction
 
 // PriorityFunctionFactory2 produces map & reduce priority functions
 // from a given args.
 // FIXME: Rename to PriorityFunctionFactory.
 type PriorityFunctionFactory2 func(PluginFactoryArgs) (priorities.PriorityMapFunction, priorities.PriorityReduceFunction)
-type CustomPriorityFunctionFactory2 func(PluginFactoryArgs) (priorities.CustomPriorityMapFunction, priorities.CustomPriorityReduceFunction)
+
+//type CustomPriorityFunctionFactory2 func(PluginFactoryArgs) (priorities.CustomPriorityMapFunction, priorities.CustomPriorityReduceFunction)
 
 // PriorityConfigFactory produces a PriorityConfig from the given function and weight
 type PriorityConfigFactory struct {
@@ -78,11 +80,11 @@ type PriorityConfigFactory struct {
 	Weight            int
 }
 
-type CustomPriorityConfigFactory struct {
-	Function          CustomPriorityFunctionFactory
-	MapReduceFunction CustomPriorityFunctionFactory2
-	Weight            int
-}
+// type CustomPriorityConfigFactory struct {
+// 	Function          CustomPriorityFunctionFactory
+// 	MapReduceFunction CustomPriorityFunctionFactory2
+// 	Weight            int
+// }
 
 var (
 	schedulerFactoryMutex sync.RWMutex
@@ -92,7 +94,7 @@ var (
 	mandatoryFitPredicates = sets.NewString()
 	priorityFunctionMap    = make(map[string]PriorityConfigFactory)
 	//custom
-	customPriorityFunctionMap = make(map[string]CustomPriorityConfigFactory)
+	//customPriorityFunctionMap = make(map[string]CustomPriorityConfigFactory)
 	//custom
 	algorithmProviderMap = make(map[string]AlgorithmProviderConfig)
 
@@ -310,26 +312,26 @@ func RegisterPriorityFunction2(
 // ---------START OF CUSTOMIZATION----------------------------------------------------------------
 //------------------------------------------------------------------------------------------------
 //------------------------------------------------------------------------------------------------
-func CustomRegisterPriorityFunction2(
-	name string,
-	mapFunction priorities.CustomPriorityMapFunction,
-	reduceFunction priorities.CustomPriorityReduceFunction,
-	weight int) string {
-	return CustomRegisterPriorityConfigFactory(name, CustomPriorityConfigFactory{
-		MapReduceFunction: func(PluginFactoryArgs) (priorities.CustomPriorityMapFunction, priorities.CustomPriorityReduceFunction) {
-			return mapFunction, reduceFunction
-		},
-		Weight: weight,
-	})
-}
-
-func CustomRegisterPriorityConfigFactory(name string, pcf CustomPriorityConfigFactory) string {
-	schedulerFactoryMutex.Lock()
-	defer schedulerFactoryMutex.Unlock()
-	validateAlgorithmNameOrDie(name)
-	customPriorityFunctionMap[name] = pcf
-	return name
-}
+// func CustomRegisterPriorityFunction2(
+// 	name string,
+// 	mapFunction priorities.CustomPriorityMapFunction,
+// 	reduceFunction priorities.CustomPriorityReduceFunction,
+// 	weight int) string {
+// 	return CustomRegisterPriorityConfigFactory(name, CustomPriorityConfigFactory{
+// 		MapReduceFunction: func(PluginFactoryArgs) (priorities.CustomPriorityMapFunction, priorities.CustomPriorityReduceFunction) {
+// 			return mapFunction, reduceFunction
+// 		},
+// 		Weight: weight,
+// 	})
+// }
+
+// func CustomRegisterPriorityConfigFactory(name string, pcf CustomPriorityConfigFactory) string {
+// 	schedulerFactoryMutex.Lock()
+// 	defer schedulerFactoryMutex.Unlock()
+// 	validateAlgorithmNameOrDie(name)
+// 	customPriorityFunctionMap[name] = pcf
+// 	return name
+// }
 
 //------------------------------------------------------------------------------------------------
 //------------------------------------------------------------------------------------------------