diff --git a/contrib/mesos/docs/scheduler.monopic b/contrib/mesos/docs/scheduler.monopic index 7d6506184ee..f29ac1cea55 100644 Binary files a/contrib/mesos/docs/scheduler.monopic and b/contrib/mesos/docs/scheduler.monopic differ diff --git a/contrib/mesos/pkg/scheduler/components/scheduler.go b/contrib/mesos/pkg/scheduler/components/scheduler.go index 39671b85f83..219114b1eb7 100644 --- a/contrib/mesos/pkg/scheduler/components/scheduler.go +++ b/contrib/mesos/pkg/scheduler/components/scheduler.go @@ -63,8 +63,8 @@ func New(c *config.Config, fw framework.Framework, ps podschedulers.PodScheduler } // Watch and queue pods that need scheduling. - updates := make(chan queue.Entry, c.UpdatesBacklog) - podUpdates := &podStoreAdapter{queue.NewHistorical(updates)} + podUpdatesBypass := make(chan queue.Entry, c.UpdatesBacklog) + podUpdates := &podStoreAdapter{queue.NewHistorical(podUpdatesBypass)} reflector := cache.NewReflector(lw, &api.Pod{}, podUpdates, 0) q := queuer.New(queue.NewDelayFIFO(), podUpdates) @@ -101,7 +101,7 @@ func New(c *config.Config, fw framework.Framework, ps podschedulers.PodScheduler runtime.On(startLatch, func() { reflector.Run() // TODO(jdef) should listen for termination - podDeleter.Run(updates, terminate) + podDeleter.Run(podUpdatesBypass, terminate) q.Run(terminate) q.InstallDebugHandlers(mux) diff --git a/contrib/mesos/pkg/scheduler/doc.go b/contrib/mesos/pkg/scheduler/doc.go index df6f15171cf..1fc5d2a162c 100644 --- a/contrib/mesos/pkg/scheduler/doc.go +++ b/contrib/mesos/pkg/scheduler/doc.go @@ -19,12 +19,11 @@ package scheduler // Created from contrib/mesos/docs/scheduler.monopic: // -// // ┌───────────────────────────────────────────────────────────────────────┐ // │ ┌───────────────────────────────────────┐ ┌─┴──────────────────────┐ ┌───────────────┐ -// ┌─────▼─────┐ │Queuer │ Await() │ podUpdates │ │ │ -// │ updates │ │- Yield() *api.Pod ├──pod CRUD ─▶ (queue.HistoricalFIFO) ◀──reflector──▶pods ListWatch ├──apiserver──▶ -// └─────▲─────┘ │- Requeue(pod)/Dequeue(id)/Reoffer(pod)│ events │ │ │ │ +// ┌────────▼─────────┐ │Queuer │ Await() │ podUpdates │ │ │ +// │ podUpdatesBypass │ │- Yield() *api.Pod ├──pod CRUD ─▶ (queue.HistoricalFIFO) ◀──reflector──▶pods ListWatch ├──apiserver──▶ +// └────────▲─────────┘ │- Requeue(pod)/Dequeue(id)/Reoffer(pod)│ events │ │ │ │ // │ └───────────────────▲───────────────────┘ └───────────┬────────────┘ └───────────────┘ // │ │ │ // │ │ │