github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

make firstfit.go threadsafe and fix its comments

Browse Source
This commit is contained in:
Kouhei Ueno 2014-07-12 15:06:51 +09:00
parent 2a03a4d502
commit 070b4ffe9f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/scheduler/firstfit.go
View File

@ -19,16 +19,17 @@ package scheduler
import ( import (
"fmt" "fmt"
"math/rand" "math/rand"
"sync"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels" "github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
) )
// FirstFitScheduler is a Scheduler interface implementation which uses first fit algorithm. // FirstFitScheduler is a Scheduler which schedules a Pod on a random machine which matches its requirement.
type FirstFitScheduler struct { type FirstFitScheduler struct {
podLister PodLister podLister PodLister
// TODO: *rand.Rand is *not* threadsafe random *rand.Rand
random *rand.Rand randomLock sync.Mutex
} }
func MakeFirstFitScheduler(podLister PodLister, random *rand.Rand) Scheduler { func MakeFirstFitScheduler(podLister PodLister, random *rand.Rand) Scheduler {
@ -49,7 +50,7 @@ func (s *FirstFitScheduler) containsPort(pod api.Pod, port api.Port) bool {
return false return false
} }
// Schedule schedules a pod on the first machine which matches its requirement. // Schedule schedules a pod on a random machine which matches its requirement.
func (s *FirstFitScheduler) Schedule(pod api.Pod, minionLister MinionLister) (string, error) { func (s *FirstFitScheduler) Schedule(pod api.Pod, minionLister MinionLister) (string, error) {
machines, err := minionLister.List() machines, err := minionLister.List()
if err != nil { if err != nil {
@ -83,5 +84,7 @@ func (s *FirstFitScheduler) Schedule(pod api.Pod, minionLister MinionLister) (st
if len(machineOptions) == 0 { if len(machineOptions) == 0 {
return "", fmt.Errorf("failed to find fit for %#v", pod) return "", fmt.Errorf("failed to find fit for %#v", pod)
} }
s.randomLock.Lock()
defer s.randomLock.Unlock()
return machineOptions[s.random.Int()%len(machineOptions)], nil return machineOptions[s.random.Int()%len(machineOptions)], nil
} }