From 1be1a8ce631134be61c23b13d6056a0495788470 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 4 Nov 2015 16:59:54 +0100 Subject: [PATCH] Rename SchedulerLoop -> Controller --- contrib/mesos/docs/scheduler.monopic | Bin 10490 -> 10494 bytes .../controller.go} | 14 +++++++------- .../{schedulerloop => controller}/doc.go | 7 ++++--- .../pkg/scheduler/components/scheduler.go | 10 +++++----- contrib/mesos/pkg/scheduler/doc.go | 3 ++- .../scheduler/integration/integration_test.go | 10 +++++----- .../mesos/pkg/scheduler/service/service.go | 2 +- 7 files changed, 24 insertions(+), 22 deletions(-) rename contrib/mesos/pkg/scheduler/components/{schedulerloop/schedulerloop.go => controller/controller.go} (92%) rename contrib/mesos/pkg/scheduler/components/{schedulerloop => controller}/doc.go (70%) diff --git a/contrib/mesos/docs/scheduler.monopic b/contrib/mesos/docs/scheduler.monopic index 0601d5d1d203518e83e051155e27282c30b0fcf2..7d6506184ee16f8b9796030d63602b3fa52f7aba 100644 GIT binary patch literal 10494 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 A&Hw-a literal 10490 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 diff --git a/contrib/mesos/pkg/scheduler/components/schedulerloop/schedulerloop.go b/contrib/mesos/pkg/scheduler/components/controller/controller.go similarity index 92% rename from contrib/mesos/pkg/scheduler/components/schedulerloop/schedulerloop.go rename to contrib/mesos/pkg/scheduler/components/controller/controller.go index 21762e93c32..61d45307403 100644 --- a/contrib/mesos/pkg/scheduler/components/schedulerloop/schedulerloop.go +++ b/contrib/mesos/pkg/scheduler/components/controller/controller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package schedulerloop +package controller import ( "time" @@ -35,11 +35,11 @@ const ( Scheduled = "Scheduled" ) -type SchedulerLoop interface { +type Controller interface { Run(<-chan struct{}) } -type schedulerLoop struct { +type controller struct { algorithm algorithm.SchedulerAlgorithm binder binder.Binder nextPod func() *api.Pod @@ -51,8 +51,8 @@ type schedulerLoop struct { func New(client *client.Client, algorithm algorithm.SchedulerAlgorithm, recorder record.EventRecorder, nextPod func() *api.Pod, error func(pod *api.Pod, schedulingErr error), - binder binder.Binder, started chan<- struct{}) SchedulerLoop { - return &schedulerLoop{ + binder binder.Binder, started chan<- struct{}) Controller { + return &controller{ algorithm: algorithm, binder: binder, nextPod: nextPod, @@ -63,14 +63,14 @@ func New(client *client.Client, algorithm algorithm.SchedulerAlgorithm, } } -func (s *schedulerLoop) Run(done <-chan struct{}) { +func (s *controller) Run(done <-chan struct{}) { defer close(s.started) go runtime.Until(s.scheduleOne, recoveryDelay, done) } // hacked from GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/scheduler.go, // with the Modeler stuff removed since we don't use it because we have mesos. -func (s *schedulerLoop) scheduleOne() { +func (s *controller) scheduleOne() { pod := s.nextPod() // pods which are pre-scheduled (i.e. NodeName is set) are deleted by the kubelet diff --git a/contrib/mesos/pkg/scheduler/components/schedulerloop/doc.go b/contrib/mesos/pkg/scheduler/components/controller/doc.go similarity index 70% rename from contrib/mesos/pkg/scheduler/components/schedulerloop/doc.go rename to contrib/mesos/pkg/scheduler/components/controller/doc.go index b3bc44d3320..8176a4e75d9 100644 --- a/contrib/mesos/pkg/scheduler/components/schedulerloop/doc.go +++ b/contrib/mesos/pkg/scheduler/components/controller/doc.go @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package schedulerloop implement the scheduler loop which waits for pod -// events from the queuer and passes them to the SchedulerAlgorithm. -package schedulerloop +// Package controller implements the scheduling controller which waits for pod +// events from the queuer (i.e. from the apiserver), passes them to the +// SchedulerAlgorithm and in case of success to the binder which does the launch. +package controller diff --git a/contrib/mesos/pkg/scheduler/components/scheduler.go b/contrib/mesos/pkg/scheduler/components/scheduler.go index adf798a464e..8c541ccb8a6 100644 --- a/contrib/mesos/pkg/scheduler/components/scheduler.go +++ b/contrib/mesos/pkg/scheduler/components/scheduler.go @@ -29,11 +29,11 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/algorithm" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/algorithm/podschedulers" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/binder" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/controller" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/deleter" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/errorhandler" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/framework" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/podreconciler" - "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/schedulerloop" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer" @@ -47,11 +47,11 @@ import ( type sched struct { podReconciler podreconciler.PodReconciler framework framework.Framework - loop schedulerloop.SchedulerLoop + controller controller.Controller // unsafe state, needs to be guarded, especially changes to podtask.T objects sync.RWMutex - taskRegistry podtask.Registry + taskRegistry podtask.Registry } func New(c *config.Config, fw framework.Framework, ps podschedulers.PodScheduler, @@ -108,12 +108,12 @@ func New(c *config.Config, fw framework.Framework, ps podschedulers.PodScheduler podtask.InstallDebugHandlers(core.Tasks(), mux) }) - core.loop = schedulerloop.New(client, algorithm, recorder, q.Yield, errorHandler.Error, binder, startLatch) + core.controller = controller.New(client, algorithm, recorder, q.Yield, errorHandler.Error, binder, startLatch) return core } func (c *sched) Run(done <-chan struct{}) { - c.loop.Run(done) + c.controller.Run(done) } func (c *sched) Reconcile(t *podtask.T) { diff --git a/contrib/mesos/pkg/scheduler/doc.go b/contrib/mesos/pkg/scheduler/doc.go index b9f95b7bafa..df6f15171cf 100644 --- a/contrib/mesos/pkg/scheduler/doc.go +++ b/contrib/mesos/pkg/scheduler/doc.go @@ -19,6 +19,7 @@ package scheduler // Created from contrib/mesos/docs/scheduler.monopic: // +// // ┌───────────────────────────────────────────────────────────────────────┐ // │ ┌───────────────────────────────────────┐ ┌─┴──────────────────────┐ ┌───────────────┐ // ┌─────▼─────┐ │Queuer │ Await() │ podUpdates │ │ │ @@ -31,7 +32,7 @@ package scheduler // ││ │ │ ┌────────────────────┼─────────────────┐ // ┌───────────────────┼┼──────────────────────────────────────┐ │ ┌───────────────────┼────┼───────────┐ │ │ // ┌───────────▼──────────┐┌───────┴┴───────┐ ┌───────────────────┐ ┌──┴─┴─┴──────┐ ┌────────┴────┴───┐ ┌────▼────────▼─────────────┐ │ -// │Binder (task launcher)││Deleter │ │PodReconciler │ │SchedulerLoop│ │ ErrorHandler │ │SchedulerAlgorithm │ │ +// │Binder (task launcher)││Deleter │ │PodReconciler │ │Controller │ │ ErrorHandler │ │SchedulerAlgorithm │ │ // │- Bind(binding) ││- DeleteOne(pod)│ │- Reconcile(pod) │ │- Run() │ │- Error(pod, err)│ │- Schedule(pod) -> NodeName│ │ // │ ││ │◀──│ │ │ │──▶│ │ │ │ │ // │ ┌─────┐││ ┌─────┐ │ │ ┌─────┐ │ │ ┌─────┐ │ │ ┌─────┐ │ │┌─────┐ │ │ diff --git a/contrib/mesos/pkg/scheduler/integration/integration_test.go b/contrib/mesos/pkg/scheduler/integration/integration_test.go index 06b645323e1..822c7ac86f8 100644 --- a/contrib/mesos/pkg/scheduler/integration/integration_test.go +++ b/contrib/mesos/pkg/scheduler/integration/integration_test.go @@ -36,8 +36,8 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/scheduler" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/algorithm/podschedulers" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/controller" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/framework" - "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/schedulerloop" schedcfg "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/ha" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" @@ -601,7 +601,7 @@ func TestScheduler_LifeCycle(t *testing.T) { lt.podsListWatch.Add(pod, true) // notify watchers // wait for failedScheduling event because there is no offer - assert.EventWithReason(lt.eventObs, schedulerloop.FailedScheduling, "failedScheduling event not received") + assert.EventWithReason(lt.eventObs, controller.FailedScheduling, "failedScheduling event not received") // add some matching offer offers := []*mesos.Offer{NewTestOffer(fmt.Sprintf("offer%d", i))} @@ -614,7 +614,7 @@ func TestScheduler_LifeCycle(t *testing.T) { lt.framework.ResourceOffers(nil, offers) // and wait for scheduled pod - assert.EventWithReason(lt.eventObs, schedulerloop.Scheduled) + assert.EventWithReason(lt.eventObs, controller.Scheduled) select { case launchedTask := <-launchedTasks: // report back that the task has been staged, and then started by mesos @@ -651,7 +651,7 @@ func TestScheduler_LifeCycle(t *testing.T) { // Launch a pod and wait until the scheduler driver is called schedulePodWithOffers := func(pod *api.Pod, offers []*mesos.Offer) (*api.Pod, *LaunchedTask, *mesos.Offer) { // wait for failedScheduling event because there is no offer - assert.EventWithReason(lt.eventObs, schedulerloop.FailedScheduling, "failedScheduling event not received") + assert.EventWithReason(lt.eventObs, controller.FailedScheduling, "failedScheduling event not received") // supply a matching offer lt.framework.ResourceOffers(lt.driver, offers) @@ -666,7 +666,7 @@ func TestScheduler_LifeCycle(t *testing.T) { } // and wait to get scheduled - assert.EventWithReason(lt.eventObs, schedulerloop.Scheduled) + assert.EventWithReason(lt.eventObs, controller.Scheduled) // wait for driver.launchTasks call select { diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go index c499e5595f9..d6540703b86 100644 --- a/contrib/mesos/pkg/scheduler/service/service.go +++ b/contrib/mesos/pkg/scheduler/service/service.go @@ -764,7 +764,7 @@ func (s *SchedulerServer) bootstrap(hks hyperkube.Interface, sc *schedcfg.Config recorder := broadcaster.NewRecorder(api.EventSource{Component: "scheduler"}) broadcaster.StartRecordingToSink(client.Events("")) - // create scheduler loop + // create scheduler core with all components arranged around it lw := cache.NewListWatchFromClient(client, "pods", api.NamespaceAll, fields.Everything()) sched := components.New(sc, framework, fcfs, client, recorder, schedulerProcess.Terminal(), s.mux, lw)