Refactor schedulers, remove schedulers, use generic scheduler.

duda · Sep 26, 2014 · 1bb9629 · 1bb9629
1 parent 44703ef
commit 1bb9629
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 135 deletions.
diff --git a/pkg/scheduler/generic_scheduler.go b/pkg/scheduler/generic_scheduler.go
@@ -100,7 +100,8 @@ func getMinHosts(list HostPriorityList) []string {
 	return result
 }
 
-func evenPriority(pod api.Pod, podLister PodLister, minionLister MinionLister) (HostPriorityList, error) {
+// EqualPriority is a prioritizer function that gives an equal weight of one to all nodes
+func EqualPriority(pod api.Pod, podLister PodLister, minionLister MinionLister) (HostPriorityList, error) {
 	nodes, err := minionLister.List()
 	result := []HostPriority{}
 

diff --git a/pkg/scheduler/generic_scheduler_test.go b/pkg/scheduler/generic_scheduler_test.go
@@ -25,6 +25,14 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 )
 
+func falsePredicate(pod api.Pod, existingPods []api.Pod, node string) (bool, error) {
+	return false, nil
+}
+
+func truePredicate(pod api.Pod, existingPods []api.Pod, node string) (bool, error) {
+	return true, nil
+}
+
 func matchesPredicate(pod api.Pod, existingPods []api.Pod, node string) (bool, error) {
 	return pod.ID == node, nil
 }
@@ -61,21 +69,21 @@ func TestGenericScheduler(t *testing.T) {
 	}{
 		{
 			predicates:  []FitPredicate{falsePredicate},
-			prioritizer: evenPriority,
+			prioritizer: EqualPriority,
 			nodes:       []string{"machine1", "machine2"},
 			expectsErr:  true,
 		},
 		{
 			predicates:  []FitPredicate{truePredicate},
-			prioritizer: evenPriority,
+			prioritizer: EqualPriority,
 			nodes:       []string{"machine1", "machine2"},
 			// Random choice between both, the rand seeded above with zero, chooses "machine2"
 			expectedHost: "machine2",
 		},
 		{
 			// Fits on a machine where the pod ID matches the machine name
 			predicates:   []FitPredicate{matchesPredicate},
-			prioritizer:  evenPriority,
+			prioritizer:  EqualPriority,
 			nodes:        []string{"machine1", "machine2"},
 			pod:          api.Pod{JSONBase: api.JSONBase{ID: "machine2"}},
 			expectedHost: "machine2",

diff --git a/pkg/scheduler/randomfit.go → pkg/scheduler/predicates.go b/pkg/scheduler/randomfit.go → pkg/scheduler/predicates.go
@@ -17,24 +17,11 @@ limitations under the License.
 package scheduler
 
 import (
-	"math/rand"
-
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 )
 
-// NewRandomFitScheduler creates a random fit scheduler with the default set of fit predicates
-func NewRandomFitScheduler(podLister PodLister, random *rand.Rand) Scheduler {
-	return NewRandomFitSchedulerWithPredicates(podLister, random, []FitPredicate{podFitsPorts})
-}
-
-// NewRandomFitScheduler creates a random fit scheduler with the specified set of fit predicates.
-// All predicates must be true for the pod to be considered a fit.
-func NewRandomFitSchedulerWithPredicates(podLister PodLister, random *rand.Rand, predicates []FitPredicate) Scheduler {
-	return NewGenericScheduler(predicates, evenPriority, podLister, random)
-}
-
-func podFitsPorts(pod api.Pod, existingPods []api.Pod, node string) (bool, error) {
+func PodFitsPorts(pod api.Pod, existingPods []api.Pod, node string) (bool, error) {
 	for _, scheduledPod := range existingPods {
 		for _, container := range pod.DesiredState.Manifest.Containers {
 			for _, port := range container.Ports {

diff --git a/pkg/scheduler/predicates_test.go b/pkg/scheduler/predicates_test.go
@@ -0,0 +1,80 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package scheduler
+
+import (
+	"testing"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+)
+
+func TestPodFitsPorts(t *testing.T) {
+	tests := []struct {
+		pod          api.Pod
+		existingPods []api.Pod
+		fits         bool
+		test         string
+	}{
+		{
+			pod:          api.Pod{},
+			existingPods: []api.Pod{},
+			fits:         true,
+			test:         "nothing running",
+		},
+		{
+			pod: newPod("m1", 8080),
+			existingPods: []api.Pod{
+				newPod("m1", 9090),
+			},
+			fits: true,
+			test: "other port",
+		},
+		{
+			pod: newPod("m1", 8080),
+			existingPods: []api.Pod{
+				newPod("m1", 8080),
+			},
+			fits: false,
+			test: "same port",
+		},
+		{
+			pod: newPod("m1", 8000, 8080),
+			existingPods: []api.Pod{
+				newPod("m1", 8080),
+			},
+			fits: false,
+			test: "second port",
+		},
+		{
+			pod: newPod("m1", 8000, 8080),
+			existingPods: []api.Pod{
+				newPod("m1", 8001, 8080),
+			},
+			fits: false,
+			test: "second port",
+		},
+	}
+	for _, test := range tests {
+		fits, err := PodFitsPorts(test.pod, test.existingPods, "machine")
+		if err != nil {
+			t.Errorf("unexpected error: %v")
+		}
+		if test.fits != fits {
+			t.Errorf("%s: expected %v, saw %v", test.test, test.fits, fits)
+		}
+	}
+}
diff --git a/pkg/scheduler/randomfit_test.go b/pkg/scheduler/randomfit_test.go
diff --git a/pkg/scheduler/spreading_scheduler.go → pkg/scheduler/spreading.go b/pkg/scheduler/spreading_scheduler.go → pkg/scheduler/spreading.go
diff --git a/pkg/scheduler/spreading_scheduler_test.go → pkg/scheduler/spreading_test.go b/pkg/scheduler/spreading_scheduler_test.go → pkg/scheduler/spreading_test.go
diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go
@@ -62,7 +62,11 @@ func (factory *ConfigFactory) Create() *scheduler.Config {
 	}
 
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	algo := algorithm.NewRandomFitScheduler(
+	algo := algorithm.NewGenericScheduler(
+		// Fit is defined based on the absence of port conflicts.
+		[]algorithm.FitPredicate{algorithm.PodFitsPorts},
+		// All nodes where things fit are equally likely (Random)
+		algorithm.EqualPriority,
 		&storeToPodLister{podCache}, r)
 
 	return &scheduler.Config{