From 08a056393356b2f369ec104319ae525a0f2c4633 Mon Sep 17 00:00:00 2001 From: Abhishek Gupta Date: Mon, 30 Mar 2015 13:35:37 -0700 Subject: [PATCH 1/2] Removing EqualPriority from the list of default priorities --- plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go b/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go index a00b65d9e00..2dffdeb0e0f 100644 --- a/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go +++ b/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go @@ -25,6 +25,10 @@ import ( func init() { factory.RegisterAlgorithmProvider(factory.DefaultProvider, defaultPredicates(), defaultPriorities()) + // EqualPriority is a prioritizer function that gives an equal weight of one to all minions + // Register the priority function so that its available + // but do not include it as part of the default priorities + factory.RegisterPriorityFunction("EqualPriority", algorithm.EqualPriority, 1) } func defaultPredicates() util.StringSet { @@ -66,7 +70,5 @@ func defaultPriorities() util.StringSet { Weight: 1, }, ), - // EqualPriority is a prioritizer function that gives an equal weight of one to all minions - factory.RegisterPriorityFunction("EqualPriority", algorithm.EqualPriority, 0), ) } From 490dd1bb67f5fd168287171022839f0bd69fc851 Mon Sep 17 00:00:00 2001 From: Abhishek Gupta Date: Mon, 30 Mar 2015 13:44:34 -0700 Subject: [PATCH 2/2] Fixing accidental hardcoding of priority function weight --- plugin/pkg/scheduler/factory/plugins.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pkg/scheduler/factory/plugins.go b/plugin/pkg/scheduler/factory/plugins.go index f61c21b78bc..a8737f5723f 100644 --- a/plugin/pkg/scheduler/factory/plugins.go +++ b/plugin/pkg/scheduler/factory/plugins.go @@ -137,7 +137,7 @@ func RegisterPriorityFunction(name string, function algorithm.PriorityFunction, Function: func(PluginFactoryArgs) algorithm.PriorityFunction { return function }, - Weight: 1, + Weight: weight, }) }