github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FirstFitScheduler was triggering a panic by passing nil as the query to

Browse Source 
EtcdRegistry.ListPods. I think this was just missed during the recent
label refactor.
This commit is contained in:
Justin Huff
2014-06-17 15:48:37 -07:00
parent 0c68c6307a
commit 1bef7fdd04
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/registry/scheduler.go
View File

@@ -20,6 +20,7 @@ import (
"math/rand" "math/rand"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
) )
// Scheduler is an interface implemented by things that know how to schedule pods onto machines. // Scheduler is an interface implemented by things that know how to schedule pods onto machines.
@@ -90,7 +91,7 @@ func (s *FirstFitScheduler) containsPort(pod api.Pod, port api.Port) bool {
func (s *FirstFitScheduler) Schedule(pod api.Pod) (string, error) { func (s *FirstFitScheduler) Schedule(pod api.Pod) (string, error) {
machineToPods := map[string][]api.Pod{} machineToPods := map[string][]api.Pod{}
pods, err := s.registry.ListPods(nil) pods, err := s.registry.ListPods(labels.Everything())
if err != nil { if err != nil {
return "", err return "", err
} }