github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shorten component constructor names

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2015-11-04 11:57:04 +01:00
parent e04bfd0a3e
commit 7adfabecda
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/mesos/pkg/scheduler/components/algorithm/algorithm.go
View File

@@ -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,

2
contrib/mesos/pkg/scheduler/components/binder/binder.go
View File

@@ -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,
}

2
contrib/mesos/pkg/scheduler/components/deleter/deleter.go
View File

@@ -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,

8
contrib/mesos/pkg/scheduler/components/deleter/deleter_test.go
View File

@@ -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)

2
contrib/mesos/pkg/scheduler/components/errorhandler/errorhandler.go
View File

@@ -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,

2
contrib/mesos/pkg/scheduler/components/framework/framework.go
View File

@@ -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)

2
contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go
View File

@@ -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,

12
contrib/mesos/pkg/scheduler/components/scheduler.go
View File

@@ -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
}

2
contrib/mesos/pkg/scheduler/components/schedulerloop/schedulerloop.go
View File

@@ -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{

2
contrib/mesos/pkg/scheduler/components/tasksreconciler/tasksreconciler.go
View File

@@ -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,