From 7adfabecda9f8e5a29bef501c882340d6840be20 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 4 Nov 2015 11:57:04 +0100 Subject: [PATCH] Shorten component constructor names --- .../pkg/scheduler/components/algorithm/algorithm.go | 2 +- .../mesos/pkg/scheduler/components/binder/binder.go | 2 +- .../pkg/scheduler/components/deleter/deleter.go | 2 +- .../pkg/scheduler/components/deleter/deleter_test.go | 8 ++++---- .../components/errorhandler/errorhandler.go | 2 +- .../pkg/scheduler/components/framework/framework.go | 2 +- .../components/podreconciler/podreconciler.go | 2 +- contrib/mesos/pkg/scheduler/components/scheduler.go | 12 ++++++------ .../components/schedulerloop/schedulerloop.go | 2 +- .../components/tasksreconciler/tasksreconciler.go | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/mesos/pkg/scheduler/components/algorithm/algorithm.go b/contrib/mesos/pkg/scheduler/components/algorithm/algorithm.go index 1c706714e73..a8bab848a73 100644 --- a/contrib/mesos/pkg/scheduler/components/algorithm/algorithm.go +++ b/contrib/mesos/pkg/scheduler/components/algorithm/algorithm.go @@ -41,7 +41,7 @@ type schedulerAlgorithm struct { podScheduler podschedulers.PodScheduler } -func NewSchedulerAlgorithm(sched scheduler.Scheduler, podUpdates queue.FIFO, podScheduler podschedulers.PodScheduler) SchedulerAlgorithm { +func New(sched scheduler.Scheduler, podUpdates queue.FIFO, podScheduler podschedulers.PodScheduler) SchedulerAlgorithm { return &schedulerAlgorithm{ sched: sched, podUpdates: podUpdates, diff --git a/contrib/mesos/pkg/scheduler/components/binder/binder.go b/contrib/mesos/pkg/scheduler/components/binder/binder.go index 4a09c9e7c6a..9b26c629a62 100644 --- a/contrib/mesos/pkg/scheduler/components/binder/binder.go +++ b/contrib/mesos/pkg/scheduler/components/binder/binder.go @@ -36,7 +36,7 @@ type binder struct { sched scheduler.Scheduler } -func NewBinder(sched scheduler.Scheduler) Binder { +func New(sched scheduler.Scheduler) Binder { return &binder{ sched: sched, } diff --git a/contrib/mesos/pkg/scheduler/components/deleter/deleter.go b/contrib/mesos/pkg/scheduler/components/deleter/deleter.go index d53bc88bfd0..94ee4d74086 100644 --- a/contrib/mesos/pkg/scheduler/components/deleter/deleter.go +++ b/contrib/mesos/pkg/scheduler/components/deleter/deleter.go @@ -39,7 +39,7 @@ type deleter struct { qr *queuer.Queuer } -func NewDeleter(sched scheduler.Scheduler, qr *queuer.Queuer) Deleter { +func New(sched scheduler.Scheduler, qr *queuer.Queuer) Deleter { return &deleter{ sched: sched, qr: qr, diff --git a/contrib/mesos/pkg/scheduler/components/deleter/deleter_test.go b/contrib/mesos/pkg/scheduler/components/deleter/deleter_test.go index a43dd91bc64..cfa03db0c31 100644 --- a/contrib/mesos/pkg/scheduler/components/deleter/deleter_test.go +++ b/contrib/mesos/pkg/scheduler/components/deleter/deleter_test.go @@ -36,7 +36,7 @@ func TestDeleteOne_NonexistentPod(t *testing.T) { qr := queuer.New(nil) assert.Equal(0, len(qr.PodQueue.List())) - d := NewDeleter(obj, qr) + d := New(obj, qr) pod := &queuer.Pod{Pod: &api.Pod{ ObjectMeta: api.ObjectMeta{ Name: "foo", @@ -72,7 +72,7 @@ func TestDeleteOne_PendingPod(t *testing.T) { assert.True(found) // exec & post conditions - d := NewDeleter(obj, qr) + d := New(obj, qr) err = d.DeleteOne(pod) assert.Nil(err) _, found = qr.PodQueue.Get("foo0") @@ -114,7 +114,7 @@ func TestDeleteOne_Running(t *testing.T) { obj.On("KillTask", task.ID).Return(nil) // exec & post conditions - d := NewDeleter(obj, qr) + d := New(obj, qr) err = d.DeleteOne(pod) assert.Nil(err) _, found = qr.PodQueue.Get("foo0") @@ -127,7 +127,7 @@ func TestDeleteOne_badPodNaming(t *testing.T) { assert := assert.New(t) obj := &types.MockScheduler{} pod := &queuer.Pod{Pod: &api.Pod{}} - d := NewDeleter(obj, queuer.New(nil)) + d := New(obj, queuer.New(nil)) err := d.DeleteOne(pod) assert.NotNil(err) diff --git a/contrib/mesos/pkg/scheduler/components/errorhandler/errorhandler.go b/contrib/mesos/pkg/scheduler/components/errorhandler/errorhandler.go index 1f915387092..04a50af894a 100644 --- a/contrib/mesos/pkg/scheduler/components/errorhandler/errorhandler.go +++ b/contrib/mesos/pkg/scheduler/components/errorhandler/errorhandler.go @@ -41,7 +41,7 @@ type errorHandler struct { podScheduler podschedulers.PodScheduler } -func NewErrorHandler(sched scheduler.Scheduler, backoff *backoff.Backoff, qr *queuer.Queuer, podScheduler podschedulers.PodScheduler) ErrorHandler { +func New(sched scheduler.Scheduler, backoff *backoff.Backoff, qr *queuer.Queuer, podScheduler podschedulers.PodScheduler) ErrorHandler { return &errorHandler{ sched: sched, backoff: backoff, diff --git a/contrib/mesos/pkg/scheduler/components/framework/framework.go b/contrib/mesos/pkg/scheduler/components/framework/framework.go index 708bbb80214..ae873eda185 100644 --- a/contrib/mesos/pkg/scheduler/components/framework/framework.go +++ b/contrib/mesos/pkg/scheduler/components/framework/framework.go @@ -284,7 +284,7 @@ func (k *framework) onInitialRegistration(driver bindings.SchedulerDriver) { r1 := k.makeTaskRegistryReconciler() r2 := k.makePodRegistryReconciler() - k.tasksReconciler = taskreconciler.NewTasksReconciler(k.asRegisteredMaster, k.makeCompositeReconciler(r1, r2), + k.tasksReconciler = taskreconciler.New(k.asRegisteredMaster, k.makeCompositeReconciler(r1, r2), k.reconcileCooldown, k.schedulerConfig.ExplicitReconciliationAbortTimeout.Duration, k.terminate) go k.tasksReconciler.Run(driver, k.terminate) diff --git a/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go b/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go index 6c66669b7ef..900b6e729e0 100644 --- a/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go +++ b/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go @@ -42,7 +42,7 @@ type podReconciler struct { deleter deleter.Deleter } -func NewPodReconciler(sched scheduler.Scheduler, client *client.Client, qr *queuer.Queuer, deleter deleter.Deleter) PodReconciler { +func New(sched scheduler.Scheduler, client *client.Client, qr *queuer.Queuer, deleter deleter.Deleter) PodReconciler { return &podReconciler{ sched: sched, client: client, diff --git a/contrib/mesos/pkg/scheduler/components/scheduler.go b/contrib/mesos/pkg/scheduler/components/scheduler.go index 1cee5ae3763..837629e4bab 100644 --- a/contrib/mesos/pkg/scheduler/components/scheduler.go +++ b/contrib/mesos/pkg/scheduler/components/scheduler.go @@ -68,16 +68,16 @@ func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.Pod q := queuer.New(podUpdates) - algorithm := algorithm.NewSchedulerAlgorithm(core, podUpdates, ps) + algorithm := algorithm.New(core, podUpdates, ps) - podDeleter := deleter.NewDeleter(core, q) + podDeleter := deleter.New(core, q) - core.podReconciler = podreconciler.NewPodReconciler(core, client, q, podDeleter) + core.podReconciler = podreconciler.New(core, client, q, podDeleter) bo := backoff.New(c.InitialPodBackoff.Duration, c.MaxPodBackoff.Duration) - errorHandler := errorhandler.NewErrorHandler(core, bo, q, ps) + errorHandler := errorhandler.New(core, bo, q, ps) - binder := binder.NewBinder(core) + binder := binder.New(core) startLatch := make(chan struct{}) @@ -90,7 +90,7 @@ func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.Pod podtask.InstallDebugHandlers(core.Tasks(), mux) }) - core.loop = schedulerloop.NewSchedulerLoop(client, algorithm, recorder, q.Yield, errorHandler.Error, binder, startLatch) + core.loop = schedulerloop.New(client, algorithm, recorder, q.Yield, errorHandler.Error, binder, startLatch) return core } diff --git a/contrib/mesos/pkg/scheduler/components/schedulerloop/schedulerloop.go b/contrib/mesos/pkg/scheduler/components/schedulerloop/schedulerloop.go index e4519c0dff4..21762e93c32 100644 --- a/contrib/mesos/pkg/scheduler/components/schedulerloop/schedulerloop.go +++ b/contrib/mesos/pkg/scheduler/components/schedulerloop/schedulerloop.go @@ -49,7 +49,7 @@ type schedulerLoop struct { started chan<- struct{} // startup latch } -func NewSchedulerLoop(client *client.Client, algorithm algorithm.SchedulerAlgorithm, +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{ diff --git a/contrib/mesos/pkg/scheduler/components/tasksreconciler/tasksreconciler.go b/contrib/mesos/pkg/scheduler/components/tasksreconciler/tasksreconciler.go index 1250b115638..ca74ff5f7c8 100644 --- a/contrib/mesos/pkg/scheduler/components/tasksreconciler/tasksreconciler.go +++ b/contrib/mesos/pkg/scheduler/components/tasksreconciler/tasksreconciler.go @@ -44,7 +44,7 @@ type tasksReconciler struct { explicitReconciliationAbortTimeout time.Duration } -func NewTasksReconciler(doer proc.Doer, action ReconcilerAction, +func New(doer proc.Doer, action ReconcilerAction, cooldown, explicitReconciliationAbortTimeout time.Duration, done <-chan struct{}) TasksReconciler { return &tasksReconciler{ Doer: doer,