Merge pull request kubernetes#1449 from brendandburns/scheduler

Refactor scheduler, use generic scheduler everywhere, delete old code.
nikhiljindal · Sep 26, 2014 · a7a46f7 · a7a46f7
2 parents f377d3e + 1bb9629
commit a7a46f7
Showing 13 changed files with 178 additions and 423 deletions.
diff --git a/pkg/scheduler/generic_scheduler.go b/pkg/scheduler/generic_scheduler.go
@@ -100,6 +100,24 @@ func getMinHosts(list HostPriorityList) []string {
 	return result
 }
 
+// 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{}
+
+	if err != nil {
+		fmt.Errorf("failed to list nodes: %v", err)
+		return []HostPriority{}, err
+	}
+	for _, minion := range nodes {
+		result = append(result, HostPriority{
+			host:  minion,
+			score: 1,
+		})
+	}
+	return result, nil
+}
+
 func NewGenericScheduler(predicates []FitPredicate, prioritizer PriorityFunction, pods PodLister, random *rand.Rand) Scheduler {
 	return &genericScheduler{
 		predicates:  predicates,

diff --git a/pkg/scheduler/generic_scheduler_test.go b/pkg/scheduler/generic_scheduler_test.go
@@ -25,25 +25,16 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 )
 
-func matchesPredicate(pod api.Pod, existingPods []api.Pod, node string) (bool, error) {
-	return pod.ID == node, nil
+func falsePredicate(pod api.Pod, existingPods []api.Pod, node string) (bool, error) {
+	return false, nil
 }
 
-func evenPriority(pod api.Pod, podLister PodLister, minionLister MinionLister) (HostPriorityList, error) {
-	nodes, err := minionLister.List()
-	result := []HostPriority{}
+func truePredicate(pod api.Pod, existingPods []api.Pod, node string) (bool, error) {
+	return true, nil
+}
 
-	if err != nil {
-		fmt.Errorf("failed to list nodes: %v", err)
-		return []HostPriority{}, err
-	}
-	for _, minion := range nodes {
-		result = append(result, HostPriority{
-			host:  minion,
-			score: 1,
-		})
-	}
-	return result, nil
+func matchesPredicate(pod api.Pod, existingPods []api.Pod, node string) (bool, error) {
+	return pod.ID == node, nil
 }
 
 func numericPriority(pod api.Pod, podLister PodLister, minionLister MinionLister) (HostPriorityList, error) {
@@ -78,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/predicates.go b/pkg/scheduler/predicates.go
@@ -0,0 +1,65 @@
+/*
+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 (
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+)
+
+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 {
+				if port.HostPort == 0 {
+					continue
+				}
+				if containsPort(scheduledPod, port) {
+					return false, nil
+				}
+			}
+		}
+	}
+	return true, nil
+}
+
+func containsPort(pod api.Pod, port api.Port) bool {
+	for _, container := range pod.DesiredState.Manifest.Containers {
+		for _, podPort := range container.Ports {
+			if podPort.HostPort == port.HostPort {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+// MapPodsToMachines obtains a list of pods and pivots that list into a map where the keys are host names
+// and the values are the list of pods running on that host.
+func MapPodsToMachines(lister PodLister) (map[string][]api.Pod, error) {
+	machineToPods := map[string][]api.Pod{}
+	// TODO: perform more targeted query...
+	pods, err := lister.ListPods(labels.Everything())
+	if err != nil {
+		return map[string][]api.Pod{}, err
+	}
+	for _, scheduledPod := range pods {
+		host := scheduledPod.CurrentState.Host
+		machineToPods[host] = append(machineToPods[host], scheduledPod)
+	}
+	return machineToPods, nil
+}
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/random.go b/pkg/scheduler/random.go
diff --git a/pkg/scheduler/random_test.go b/pkg/scheduler/random_test.go