Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
7adfabec
Commit
7adfabec
authored
Nov 04, 2015
by
Dr. Stefan Schimanski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Shorten component constructor names
parent
e04bfd0a
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
18 additions
and
18 deletions
+18
-18
algorithm.go
...rib/mesos/pkg/scheduler/components/algorithm/algorithm.go
+1
-1
binder.go
contrib/mesos/pkg/scheduler/components/binder/binder.go
+1
-1
deleter.go
contrib/mesos/pkg/scheduler/components/deleter/deleter.go
+1
-1
deleter_test.go
...ib/mesos/pkg/scheduler/components/deleter/deleter_test.go
+4
-4
errorhandler.go
...sos/pkg/scheduler/components/errorhandler/errorhandler.go
+1
-1
framework.go
...rib/mesos/pkg/scheduler/components/framework/framework.go
+1
-1
podreconciler.go
...s/pkg/scheduler/components/podreconciler/podreconciler.go
+1
-1
scheduler.go
contrib/mesos/pkg/scheduler/components/scheduler.go
+6
-6
schedulerloop.go
...s/pkg/scheduler/components/schedulerloop/schedulerloop.go
+1
-1
tasksreconciler.go
...g/scheduler/components/tasksreconciler/tasksreconciler.go
+1
-1
No files found.
contrib/mesos/pkg/scheduler/components/algorithm/algorithm.go
View file @
7adfabec
...
@@ -41,7 +41,7 @@ type schedulerAlgorithm struct {
...
@@ -41,7 +41,7 @@ type schedulerAlgorithm struct {
podScheduler
podschedulers
.
PodScheduler
podScheduler
podschedulers
.
PodScheduler
}
}
func
New
SchedulerAlgorithm
(
sched
scheduler
.
Scheduler
,
podUpdates
queue
.
FIFO
,
podScheduler
podschedulers
.
PodScheduler
)
SchedulerAlgorithm
{
func
New
(
sched
scheduler
.
Scheduler
,
podUpdates
queue
.
FIFO
,
podScheduler
podschedulers
.
PodScheduler
)
SchedulerAlgorithm
{
return
&
schedulerAlgorithm
{
return
&
schedulerAlgorithm
{
sched
:
sched
,
sched
:
sched
,
podUpdates
:
podUpdates
,
podUpdates
:
podUpdates
,
...
...
contrib/mesos/pkg/scheduler/components/binder/binder.go
View file @
7adfabec
...
@@ -36,7 +36,7 @@ type binder struct {
...
@@ -36,7 +36,7 @@ type binder struct {
sched
scheduler
.
Scheduler
sched
scheduler
.
Scheduler
}
}
func
New
Binder
(
sched
scheduler
.
Scheduler
)
Binder
{
func
New
(
sched
scheduler
.
Scheduler
)
Binder
{
return
&
binder
{
return
&
binder
{
sched
:
sched
,
sched
:
sched
,
}
}
...
...
contrib/mesos/pkg/scheduler/components/deleter/deleter.go
View file @
7adfabec
...
@@ -39,7 +39,7 @@ type deleter struct {
...
@@ -39,7 +39,7 @@ type deleter struct {
qr
*
queuer
.
Queuer
qr
*
queuer
.
Queuer
}
}
func
New
Deleter
(
sched
scheduler
.
Scheduler
,
qr
*
queuer
.
Queuer
)
Deleter
{
func
New
(
sched
scheduler
.
Scheduler
,
qr
*
queuer
.
Queuer
)
Deleter
{
return
&
deleter
{
return
&
deleter
{
sched
:
sched
,
sched
:
sched
,
qr
:
qr
,
qr
:
qr
,
...
...
contrib/mesos/pkg/scheduler/components/deleter/deleter_test.go
View file @
7adfabec
...
@@ -36,7 +36,7 @@ func TestDeleteOne_NonexistentPod(t *testing.T) {
...
@@ -36,7 +36,7 @@ func TestDeleteOne_NonexistentPod(t *testing.T) {
qr
:=
queuer
.
New
(
nil
)
qr
:=
queuer
.
New
(
nil
)
assert
.
Equal
(
0
,
len
(
qr
.
PodQueue
.
List
()))
assert
.
Equal
(
0
,
len
(
qr
.
PodQueue
.
List
()))
d
:=
New
Deleter
(
obj
,
qr
)
d
:=
New
(
obj
,
qr
)
pod
:=
&
queuer
.
Pod
{
Pod
:
&
api
.
Pod
{
pod
:=
&
queuer
.
Pod
{
Pod
:
&
api
.
Pod
{
ObjectMeta
:
api
.
ObjectMeta
{
ObjectMeta
:
api
.
ObjectMeta
{
Name
:
"foo"
,
Name
:
"foo"
,
...
@@ -72,7 +72,7 @@ func TestDeleteOne_PendingPod(t *testing.T) {
...
@@ -72,7 +72,7 @@ func TestDeleteOne_PendingPod(t *testing.T) {
assert
.
True
(
found
)
assert
.
True
(
found
)
// exec & post conditions
// exec & post conditions
d
:=
New
Deleter
(
obj
,
qr
)
d
:=
New
(
obj
,
qr
)
err
=
d
.
DeleteOne
(
pod
)
err
=
d
.
DeleteOne
(
pod
)
assert
.
Nil
(
err
)
assert
.
Nil
(
err
)
_
,
found
=
qr
.
PodQueue
.
Get
(
"foo0"
)
_
,
found
=
qr
.
PodQueue
.
Get
(
"foo0"
)
...
@@ -114,7 +114,7 @@ func TestDeleteOne_Running(t *testing.T) {
...
@@ -114,7 +114,7 @@ func TestDeleteOne_Running(t *testing.T) {
obj
.
On
(
"KillTask"
,
task
.
ID
)
.
Return
(
nil
)
obj
.
On
(
"KillTask"
,
task
.
ID
)
.
Return
(
nil
)
// exec & post conditions
// exec & post conditions
d
:=
New
Deleter
(
obj
,
qr
)
d
:=
New
(
obj
,
qr
)
err
=
d
.
DeleteOne
(
pod
)
err
=
d
.
DeleteOne
(
pod
)
assert
.
Nil
(
err
)
assert
.
Nil
(
err
)
_
,
found
=
qr
.
PodQueue
.
Get
(
"foo0"
)
_
,
found
=
qr
.
PodQueue
.
Get
(
"foo0"
)
...
@@ -127,7 +127,7 @@ func TestDeleteOne_badPodNaming(t *testing.T) {
...
@@ -127,7 +127,7 @@ func TestDeleteOne_badPodNaming(t *testing.T) {
assert
:=
assert
.
New
(
t
)
assert
:=
assert
.
New
(
t
)
obj
:=
&
types
.
MockScheduler
{}
obj
:=
&
types
.
MockScheduler
{}
pod
:=
&
queuer
.
Pod
{
Pod
:
&
api
.
Pod
{}}
pod
:=
&
queuer
.
Pod
{
Pod
:
&
api
.
Pod
{}}
d
:=
New
Deleter
(
obj
,
queuer
.
New
(
nil
))
d
:=
New
(
obj
,
queuer
.
New
(
nil
))
err
:=
d
.
DeleteOne
(
pod
)
err
:=
d
.
DeleteOne
(
pod
)
assert
.
NotNil
(
err
)
assert
.
NotNil
(
err
)
...
...
contrib/mesos/pkg/scheduler/components/errorhandler/errorhandler.go
View file @
7adfabec
...
@@ -41,7 +41,7 @@ type errorHandler struct {
...
@@ -41,7 +41,7 @@ type errorHandler struct {
podScheduler
podschedulers
.
PodScheduler
podScheduler
podschedulers
.
PodScheduler
}
}
func
New
ErrorHandler
(
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
{
return
&
errorHandler
{
sched
:
sched
,
sched
:
sched
,
backoff
:
backoff
,
backoff
:
backoff
,
...
...
contrib/mesos/pkg/scheduler/components/framework/framework.go
View file @
7adfabec
...
@@ -284,7 +284,7 @@ func (k *framework) onInitialRegistration(driver bindings.SchedulerDriver) {
...
@@ -284,7 +284,7 @@ func (k *framework) onInitialRegistration(driver bindings.SchedulerDriver) {
r1
:=
k
.
makeTaskRegistryReconciler
()
r1
:=
k
.
makeTaskRegistryReconciler
()
r2
:=
k
.
makePodRegistryReconciler
()
r2
:=
k
.
makePodRegistryReconciler
()
k
.
tasksReconciler
=
taskreconciler
.
New
TasksReconciler
(
k
.
asRegisteredMaster
,
k
.
makeCompositeReconciler
(
r1
,
r2
),
k
.
tasksReconciler
=
taskreconciler
.
New
(
k
.
asRegisteredMaster
,
k
.
makeCompositeReconciler
(
r1
,
r2
),
k
.
reconcileCooldown
,
k
.
schedulerConfig
.
ExplicitReconciliationAbortTimeout
.
Duration
,
k
.
terminate
)
k
.
reconcileCooldown
,
k
.
schedulerConfig
.
ExplicitReconciliationAbortTimeout
.
Duration
,
k
.
terminate
)
go
k
.
tasksReconciler
.
Run
(
driver
,
k
.
terminate
)
go
k
.
tasksReconciler
.
Run
(
driver
,
k
.
terminate
)
...
...
contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go
View file @
7adfabec
...
@@ -42,7 +42,7 @@ type podReconciler struct {
...
@@ -42,7 +42,7 @@ type podReconciler struct {
deleter
deleter
.
Deleter
deleter
deleter
.
Deleter
}
}
func
New
PodReconciler
(
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
{
return
&
podReconciler
{
sched
:
sched
,
sched
:
sched
,
client
:
client
,
client
:
client
,
...
...
contrib/mesos/pkg/scheduler/components/scheduler.go
View file @
7adfabec
...
@@ -68,16 +68,16 @@ func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.Pod
...
@@ -68,16 +68,16 @@ func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.Pod
q
:=
queuer
.
New
(
podUpdates
)
q
:=
queuer
.
New
(
podUpdates
)
algorithm
:=
algorithm
.
New
SchedulerAlgorithm
(
core
,
podUpdates
,
ps
)
algorithm
:=
algorithm
.
New
(
core
,
podUpdates
,
ps
)
podDeleter
:=
deleter
.
New
Deleter
(
core
,
q
)
podDeleter
:=
deleter
.
New
(
core
,
q
)
core
.
podReconciler
=
podreconciler
.
New
PodReconciler
(
core
,
client
,
q
,
podDeleter
)
core
.
podReconciler
=
podreconciler
.
New
(
core
,
client
,
q
,
podDeleter
)
bo
:=
backoff
.
New
(
c
.
InitialPodBackoff
.
Duration
,
c
.
MaxPodBackoff
.
Duration
)
bo
:=
backoff
.
New
(
c
.
InitialPodBackoff
.
Duration
,
c
.
MaxPodBackoff
.
Duration
)
errorHandler
:=
errorhandler
.
New
ErrorHandler
(
core
,
bo
,
q
,
ps
)
errorHandler
:=
errorhandler
.
New
(
core
,
bo
,
q
,
ps
)
binder
:=
binder
.
New
Binder
(
core
)
binder
:=
binder
.
New
(
core
)
startLatch
:=
make
(
chan
struct
{})
startLatch
:=
make
(
chan
struct
{})
...
@@ -90,7 +90,7 @@ func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.Pod
...
@@ -90,7 +90,7 @@ func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.Pod
podtask
.
InstallDebugHandlers
(
core
.
Tasks
(),
mux
)
podtask
.
InstallDebugHandlers
(
core
.
Tasks
(),
mux
)
})
})
core
.
loop
=
schedulerloop
.
New
SchedulerLoop
(
client
,
algorithm
,
recorder
,
q
.
Yield
,
errorHandler
.
Error
,
binder
,
startLatch
)
core
.
loop
=
schedulerloop
.
New
(
client
,
algorithm
,
recorder
,
q
.
Yield
,
errorHandler
.
Error
,
binder
,
startLatch
)
return
core
return
core
}
}
...
...
contrib/mesos/pkg/scheduler/components/schedulerloop/schedulerloop.go
View file @
7adfabec
...
@@ -49,7 +49,7 @@ type schedulerLoop struct {
...
@@ -49,7 +49,7 @@ type schedulerLoop struct {
started
chan
<-
struct
{}
// startup latch
started
chan
<-
struct
{}
// startup latch
}
}
func
New
SchedulerLoop
(
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
),
recorder
record
.
EventRecorder
,
nextPod
func
()
*
api
.
Pod
,
error
func
(
pod
*
api
.
Pod
,
schedulingErr
error
),
binder
binder
.
Binder
,
started
chan
<-
struct
{})
SchedulerLoop
{
binder
binder
.
Binder
,
started
chan
<-
struct
{})
SchedulerLoop
{
return
&
schedulerLoop
{
return
&
schedulerLoop
{
...
...
contrib/mesos/pkg/scheduler/components/tasksreconciler/tasksreconciler.go
View file @
7adfabec
...
@@ -44,7 +44,7 @@ type tasksReconciler struct {
...
@@ -44,7 +44,7 @@ type tasksReconciler struct {
explicitReconciliationAbortTimeout
time
.
Duration
explicitReconciliationAbortTimeout
time
.
Duration
}
}
func
New
TasksReconciler
(
doer
proc
.
Doer
,
action
ReconcilerAction
,
func
New
(
doer
proc
.
Doer
,
action
ReconcilerAction
,
cooldown
,
explicitReconciliationAbortTimeout
time
.
Duration
,
done
<-
chan
struct
{})
TasksReconciler
{
cooldown
,
explicitReconciliationAbortTimeout
time
.
Duration
,
done
<-
chan
struct
{})
TasksReconciler
{
return
&
tasksReconciler
{
return
&
tasksReconciler
{
Doer
:
doer
,
Doer
:
doer
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment