spdf/elektron
Archived
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity

used offerUtils#PowerClass(...) instead of inlining the source code.

Browse source
This commit is contained in:
Pradyumna Kaushik 2017-01-31 16:33:59 -05:00
parent b815d65910
commit f4b5ffc1de
2 changed files with 4 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
schedulers/bottomHeavy.go
View file

@ -127,17 +127,6 @@ func (s *BottomHeavy) newTask(offer *mesos.Offer, task def.Task, newTaskClass st
}
}
// retrieve the power class of host in offer
func (s *BottomHeavy) getPowerClass(offer *mesos.Offer) string {
var powerClass string
for _, attr := range offer.GetAttributes() {
if attr.GetName() == "class" {
powerClass = attr.GetText().GetValue()
}
}
return powerClass
}
// Shut down scheduler if no more tasks to schedule
func (s *BottomHeavy) shutDownIfNecessary() {
if len(s.smallTasks) <= 0 && len(s.largeTasks) <= 0 {
@ -182,7 +171,7 @@ func (s *BottomHeavy) pack(offers []*mesos.Offer, driver sched.SchedulerDriver)
task := s.largeTasks[i]
for *task.Instances > 0 {
powerClass := s.getPowerClass(offer)
powerClass := offerUtils.PowerClass(offer)
// Does the task fit
// OR lazy evaluation. If ignore watts is set to true, second statement won't
// be evaluated.
@ -242,7 +231,7 @@ func (s *BottomHeavy) spread(offers []*mesos.Offer, driver sched.SchedulerDriver
taken := false
for i := 0; i < len(s.smallTasks); i++ {
task := s.smallTasks[i]
powerClass := s.getPowerClass(offer)
powerClass := offerUtils.PowerClass(offer)
// Decision to take the offer or not
wattsToConsider := task.Watts

15
schedulers/topHeavy.go
View file

@ -127,17 +127,6 @@ func (s *TopHeavy) newTask(offer *mesos.Offer, task def.Task, newTaskClass strin
}
}
// retrieve the power class of host in offer
func (s *TopHeavy) getPowerClass(offer *mesos.Offer) string {
var powerClass string
for _, attr := range offer.GetAttributes() {
if attr.GetName() == "class" {
powerClass = attr.GetText().GetValue()
}
}
return powerClass
}
// Shut down scheduler if no more tasks to schedule
func (s *TopHeavy) shutDownIfNecessary() {
if len(s.smallTasks) <= 0 && len(s.largeTasks) <= 0 {
@ -182,7 +171,7 @@ func (s *TopHeavy) pack(offers []*mesos.Offer, driver sched.SchedulerDriver) {
task := s.smallTasks[i]
for *task.Instances > 0 {
powerClass := s.getPowerClass(offer)
powerClass := offerUtils.PowerClass(offer)
// Does the task fit
// OR lazy evaluation. If ignore watts is set to true, second statement won't
// be evaluated.
@ -242,7 +231,7 @@ func (s *TopHeavy) spread(offers []*mesos.Offer, driver sched.SchedulerDriver) {
taken := false
for i := 0; i < len(s.largeTasks); i++ {
task := s.largeTasks[i]
powerClass := s.getPowerClass(offer)
powerClass := offerUtils.PowerClass(offer)
// Decision to take the offer or not
wattsToConsider := task.Watts