From b0140a8b9366b3b6d17c4fe1a0f412833b9dacc7 Mon Sep 17 00:00:00 2001 From: Pradyumna Kaushik Date: Wed, 7 Dec 2016 01:11:30 -0500 Subject: [PATCH] Using ranked proactive cluster wide capper with clever recapping --- scheduler.go | 2 +- schedulers/proactiveclusterwidecappingranked.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scheduler.go b/scheduler.go index 356587f..280d788 100644 --- a/scheduler.go +++ b/scheduler.go @@ -56,7 +56,7 @@ func main() { fmt.Println(task) } - scheduler := schedulers.NewProactiveClusterwideCapFCFS(tasks, *ignoreWatts) + scheduler := schedulers.NewProactiveClusterwideCapRanked(tasks, *ignoreWatts) driver, err := sched.NewMesosSchedulerDriver(sched.DriverConfig{ Master: *master, Framework: &mesos.FrameworkInfo{ diff --git a/schedulers/proactiveclusterwidecappingranked.go b/schedulers/proactiveclusterwidecappingranked.go index 963de40..69ae26f 100644 --- a/schedulers/proactiveclusterwidecappingranked.go +++ b/schedulers/proactiveclusterwidecappingranked.go @@ -381,8 +381,8 @@ func (s *ProactiveClusterwideCapRanked) StatusUpdate(driver sched.SchedulerDrive // Need to remove the task from the window s.capper.taskFinished(*status.TaskId.Value) // Determining the new cluster wide cap. - tempCap, err := s.capper.recap(s.totalPower, s.taskMonitor, *status.TaskId.Value) - // tempCap, err := s.capper.cleverRecap(s.totalPower, s.taskMonitor, *status.TaskId.Value) + //tempCap, err := s.capper.recap(s.totalPower, s.taskMonitor, *status.TaskId.Value) + tempCap, err := s.capper.cleverRecap(s.totalPower, s.taskMonitor, *status.TaskId.Value) if err == nil { // If new determined cap value is different from the current recap value then we need to recap.