From fa0cd43a5ec9898e8d66436b50ee8ac32a75ad65 Mon Sep 17 00:00:00 2001 From: Renan DelValle Date: Tue, 18 Oct 2016 17:39:44 -0400 Subject: [PATCH] Minor renaming of receivers in some schedulers --- schedulers/firstfit.go | 4 ++-- schedulers/firstfitsortedwatts.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schedulers/firstfit.go b/schedulers/firstfit.go index 91a68f1..bdfad7e 100644 --- a/schedulers/firstfit.go +++ b/schedulers/firstfit.go @@ -13,13 +13,13 @@ import ( ) // Decides if to take an offer or not -func (*FirstFit) takeOffer(offer *mesos.Offer, task def.Task) bool { +func (s *FirstFit) takeOffer(offer *mesos.Offer, task def.Task) bool { cpus, mem, watts := OfferAgg(offer) //TODO: Insert watts calculation here instead of taking them as a parameter - if cpus >= task.CPU && mem >= task.RAM && watts >= task.Watts { + if cpus >= task.CPU && mem >= task.RAM && (s.ignoreWatts || watts >= task.Watts) { return true } diff --git a/schedulers/firstfitsortedwatts.go b/schedulers/firstfitsortedwatts.go index 521f773..7214822 100644 --- a/schedulers/firstfitsortedwatts.go +++ b/schedulers/firstfitsortedwatts.go @@ -14,13 +14,13 @@ import ( ) // Decides if to take an offer or not -func (*FirstFitSortedWatts) takeOffer(offer *mesos.Offer, task def.Task) bool { +func (s *FirstFitSortedWatts) takeOffer(offer *mesos.Offer, task def.Task) bool { cpus, mem, watts := OfferAgg(offer) //TODO: Insert watts calculation here instead of taking them as a parameter - if cpus >= task.CPU && mem >= task.RAM && watts >= task.Watts { + if cpus >= task.CPU && mem >= task.RAM && (s.ignoreWatts || watts >= task.Watts) { return true }