diff --git a/schedulers/MaxGreedyMins.go b/schedulers/MaxGreedyMins.go index 5f4cb6b..8b74903 100644 --- a/schedulers/MaxGreedyMins.go +++ b/schedulers/MaxGreedyMins.go @@ -158,9 +158,7 @@ func (s *MaxGreedyMins) ConsumeOffers(spc SchedPolicyContext, driver sched.Sched if offerTaken { baseSchedRef.LogTaskStarting(nil, offer) - if err := LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver); err != nil { - baseSchedRef.LogElectronError(err) - } + LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver) } else { // If there was no match for the task diff --git a/schedulers/MaxMin.go b/schedulers/MaxMin.go index aac25f5..67a53d5 100644 --- a/schedulers/MaxMin.go +++ b/schedulers/MaxMin.go @@ -153,9 +153,7 @@ func (s *MaxMin) ConsumeOffers(spc SchedPolicyContext, driver sched.SchedulerDri if offerTaken { baseSchedRef.LogTaskStarting(nil, offer) - if err := LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver); err != nil { - baseSchedRef.LogElectronError(err) - } + LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver) } else { // If there was no match for the task cpus, mem, watts := offerUtils.OfferAgg(offer) diff --git a/schedulers/bin-packing.go b/schedulers/bin-packing.go index fbaed3f..097af0f 100644 --- a/schedulers/bin-packing.go +++ b/schedulers/bin-packing.go @@ -102,9 +102,7 @@ func (s *BinPackSortedWatts) ConsumeOffers(spc SchedPolicyContext, driver sched. if offerTaken { baseSchedRef.LogTaskStarting(nil, offer) - if err := LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver); err != nil { - baseSchedRef.LogElectronError(err) - } + LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver) } else { // If there was no match for the task diff --git a/schedulers/first-fit.go b/schedulers/first-fit.go index c1ac810..c7c4ccf 100644 --- a/schedulers/first-fit.go +++ b/schedulers/first-fit.go @@ -70,9 +70,7 @@ func (s *FirstFit) ConsumeOffers(spc SchedPolicyContext, driver sched.SchedulerD tasks = append(tasks, taskToSchedule) baseSchedRef.LogTaskStarting(&task, offer) - if err := LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver); err != nil { - baseSchedRef.LogElectronError(err) - } + LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver) offerTaken = true baseSchedRef.LogSchedTrace(taskToSchedule, offer) diff --git a/schedulers/helpers.go b/schedulers/helpers.go index 60ff2e4..2caa26f 100644 --- a/schedulers/helpers.go +++ b/schedulers/helpers.go @@ -9,7 +9,6 @@ import ( mesos "github.com/mesos/mesos-go/api/v0/mesosproto" sched "github.com/mesos/mesos-go/api/v0/scheduler" "github.com/pkg/errors" - "log" ) func coLocated(tasks map[string]bool, s BaseScheduler) { @@ -125,16 +124,11 @@ func WithSchedPolSwitchEnabled(enableSchedPolicySwitch bool) schedPolicyOption { } } -// Launch tasks and also update the resource availability for the corresponding host. -func LaunchTasks(offerIDs []*mesos.OfferID, tasksToLaunch []*mesos.TaskInfo, driver sched.SchedulerDriver) error { +// Launch tasks. +func LaunchTasks(offerIDs []*mesos.OfferID, tasksToLaunch []*mesos.TaskInfo, driver sched.SchedulerDriver) { driver.LaunchTasks(offerIDs, tasksToLaunch, mesosUtils.DefaultFilter) // Update resource availability - var err error for _, task := range tasksToLaunch { - err = utilities.ResourceAvailabilityUpdate("ON_TASK_ACTIVE_STATE", *task.TaskId, *task.SlaveId) - if err != nil { - log.Println(err) - } + utilities.ResourceAvailabilityUpdate("ON_TASK_ACTIVE_STATE", *task.TaskId, *task.SlaveId) } - return err }