github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Make PodScheduler in MesosScheduler explicit

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2015-10-26 11:18:01 -05:00
parent de5f0f73e7
commit c8edeb0f57
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/mesos/pkg/scheduler/mesos_scheduler.go
View File

@ -70,7 +70,7 @@ type MesosScheduler struct {
// and the invoking the pod registry interfaces. // and the invoking the pod registry interfaces.
// In particular, changes to podtask.T objects are currently guarded by this lock. // In particular, changes to podtask.T objects are currently guarded by this lock.
*sync.RWMutex *sync.RWMutex
podschedulers.PodScheduler podScheduler podschedulers.PodScheduler
// Config related, write-once // Config related, write-once
@ -127,7 +127,7 @@ func New(config Config) *MesosScheduler {
RWMutex: new(sync.RWMutex), RWMutex: new(sync.RWMutex),
executor: config.Executor, executor: config.Executor,
executorGroup: uid.Parse(config.Executor.ExecutorId.GetValue()).Group(), executorGroup: uid.Parse(config.Executor.ExecutorId.GetValue()).Group(),
PodScheduler: config.PodScheduler, podScheduler: config.PodScheduler,
client: config.Client, client: config.Client,
etcdClient: config.EtcdClient, etcdClient: config.EtcdClient,
failoverTimeout: config.FailoverTimeout, failoverTimeout: config.FailoverTimeout,

2
contrib/mesos/pkg/scheduler/plugin.go
View File

@ -66,7 +66,7 @@ type mesosSchedulerApiAdapter struct {
} }
func (k *mesosSchedulerApiAdapter) Algorithm() podschedulers.PodScheduler { func (k *mesosSchedulerApiAdapter) Algorithm() podschedulers.PodScheduler {
return k.mesosScheduler return k.mesosScheduler.podScheduler
} }
func (k *mesosSchedulerApiAdapter) Offers() offers.Registry { func (k *mesosSchedulerApiAdapter) Offers() offers.Registry {