Track resource usage across the cluster. Created utility in utilities/ to track the total and the unused resources for each host in the cluster. Added utility to def/taskUtils.go to retrieve the resource requirement for a given taskID. Decoupled the code, to launch a list of tasks on a set of offerIDs, to schedulers/helpers.go and updated all the scheduling policies to call this function instead of directly calling mesos.SchedulerDriver#LaunchTasks. The resource availability of the cluster is updated at 2 stages -- 1. When the tasks are about to be launched (in schedulers/helpers.go#LaunchTasks), the scheduling policy switching logic will be able to adhere to the update in the resource availability due to the JUST launched tasks and 2. when a terminal status update is received for a task (in schedulers/base.go#statusUpdate).
This commit is contained in:
parent
6cd61ed18b
commit
657dc8df93
9 changed files with 232 additions and 5 deletions
|
@ -36,6 +36,7 @@ func TasksFromJSON(uri string) ([]Task, error) {
|
|||
return nil, errors.Wrap(err, "Error unmarshalling")
|
||||
}
|
||||
|
||||
initTaskResourceRequirements(tasks)
|
||||
return tasks, nil
|
||||
}
|
||||
|
||||
|
|
|
@ -4,6 +4,8 @@ import (
|
|||
"github.com/mash/gokmeans"
|
||||
"log"
|
||||
"sort"
|
||||
"errors"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
// Information about a cluster of tasks.
|
||||
|
@ -122,3 +124,38 @@ func SortTasks(ts []Task, sb sortBy) {
|
|||
return sb(&ts[i]) <= sb(&ts[j])
|
||||
})
|
||||
}
|
||||
|
||||
// Map taskIDs to resource requirements.
|
||||
type TaskResources struct {
|
||||
CPU float64
|
||||
Ram float64
|
||||
Watts float64
|
||||
}
|
||||
|
||||
var taskResourceRequirement map[string]*TaskResources
|
||||
|
||||
// Record resource requirements for all the tasks.
|
||||
func initTaskResourceRequirements(tasks []Task) {
|
||||
taskResourceRequirement = make(map[string]*TaskResources)
|
||||
baseTaskID := "electron-"
|
||||
for _, task := range tasks {
|
||||
for i := *task.Instances; i > 0; i-- {
|
||||
taskID := fmt.Sprintf("%s-%d", baseTaskID + task.Name, *task.Instances)
|
||||
taskResourceRequirement[taskID] = &TaskResources{
|
||||
CPU: task.CPU,
|
||||
Ram: task.RAM,
|
||||
Watts: task.Watts,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Retrieve the resource requirement of a task specified by the TaskID
|
||||
func GetResourceRequirement(taskID string) (TaskResources, error) {
|
||||
if tr, ok := taskResourceRequirement[taskID]; ok {
|
||||
return *tr, nil
|
||||
} else {
|
||||
// Shouldn't be here.
|
||||
return TaskResources{}, errors.New("Invalid TaskID: " + taskID)
|
||||
}
|
||||
}
|
|
@ -160,7 +160,9 @@ func (s *MaxGreedyMins) ConsumeOffers(spc SchedPolicyContext, driver sched.Sched
|
|||
|
||||
if offerTaken {
|
||||
baseSchedRef.LogTaskStarting(nil, offer)
|
||||
driver.LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, mesosUtils.DefaultFilter)
|
||||
if err := LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver); err != nil {
|
||||
baseSchedRef.LogElectronError(err)
|
||||
}
|
||||
} else {
|
||||
|
||||
// If there was no match for the task
|
||||
|
|
|
@ -155,7 +155,9 @@ func (s *MaxMin) ConsumeOffers(spc SchedPolicyContext, driver sched.SchedulerDri
|
|||
|
||||
if offerTaken {
|
||||
baseSchedRef.LogTaskStarting(nil, offer)
|
||||
driver.LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, mesosUtils.DefaultFilter)
|
||||
if err := LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver); err != nil {
|
||||
baseSchedRef.LogElectronError(err)
|
||||
}
|
||||
} else {
|
||||
// If there was no match for the task
|
||||
cpus, mem, watts := offerUtils.OfferAgg(offer)
|
||||
|
|
|
@ -12,6 +12,7 @@ import (
|
|||
"log"
|
||||
"sync"
|
||||
"time"
|
||||
"bitbucket.org/sunybingcloud/elektron/utilities"
|
||||
)
|
||||
|
||||
type baseScheduler struct {
|
||||
|
@ -27,6 +28,7 @@ type baseScheduler struct {
|
|||
running map[string]map[string]bool
|
||||
wattsAsAResource bool
|
||||
classMapWatts bool
|
||||
totalResourceAvailabilityRecorded bool
|
||||
|
||||
// First set of PCP values are garbage values, signal to logger to start recording when we're
|
||||
// about to schedule a new task
|
||||
|
@ -162,6 +164,7 @@ func (s *baseScheduler) Disconnected(sched.SchedulerDriver) {
|
|||
}
|
||||
|
||||
func (s *baseScheduler) ResourceOffers(driver sched.SchedulerDriver, offers []*mesos.Offer) {
|
||||
utilities.RecordTotalResourceAvailability(offers)
|
||||
s.curSchedPolicy.ConsumeOffers(s, driver, offers)
|
||||
}
|
||||
|
||||
|
@ -170,6 +173,9 @@ func (s *baseScheduler) StatusUpdate(driver sched.SchedulerDriver, status *mesos
|
|||
if *status.State == mesos.TaskState_TASK_RUNNING {
|
||||
s.tasksRunning++
|
||||
} else if IsTerminal(status.State) {
|
||||
// Update resource availability.
|
||||
utilities.ResourceAvailabilityUpdate("ON_TASK_TERMINAL_STATE",
|
||||
*status.TaskId, *status.SlaveId)
|
||||
delete(s.running[status.GetSlaveId().GoString()], *status.TaskId.Value)
|
||||
s.tasksRunning--
|
||||
if s.tasksRunning == 0 {
|
||||
|
|
|
@ -104,7 +104,9 @@ func (s *BinPackSortedWatts) ConsumeOffers(spc SchedPolicyContext, driver sched.
|
|||
|
||||
if offerTaken {
|
||||
baseSchedRef.LogTaskStarting(nil, offer)
|
||||
driver.LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, mesosUtils.DefaultFilter)
|
||||
if err := LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver); err != nil {
|
||||
baseSchedRef.LogElectronError(err)
|
||||
}
|
||||
} else {
|
||||
|
||||
// If there was no match for the task
|
||||
|
|
|
@ -71,8 +71,9 @@ func (s *FirstFit) ConsumeOffers(spc SchedPolicyContext, driver sched.SchedulerD
|
|||
tasks = append(tasks, taskToSchedule)
|
||||
|
||||
baseSchedRef.LogTaskStarting(&task, offer)
|
||||
driver.LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, mesosUtils.DefaultFilter)
|
||||
|
||||
if err := LaunchTasks([]*mesos.OfferID{offer.Id}, tasks, driver); err != nil {
|
||||
baseSchedRef.LogElectronError(err)
|
||||
}
|
||||
offerTaken = true
|
||||
|
||||
baseSchedRef.LogSchedTrace(taskToSchedule, offer)
|
||||
|
|
|
@ -5,6 +5,10 @@ import (
|
|||
"bitbucket.org/sunybingcloud/elektron/def"
|
||||
"errors"
|
||||
elecLogDef "bitbucket.org/sunybingcloud/elektron/logging/def"
|
||||
"bitbucket.org/sunybingcloud/elektron/utilities"
|
||||
"bitbucket.org/sunybingcloud/elektron/utilities/mesosUtils"
|
||||
mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
|
||||
sched "github.com/mesos/mesos-go/api/v0/scheduler"
|
||||
)
|
||||
|
||||
func coLocated(tasks map[string]bool, s baseScheduler) {
|
||||
|
@ -119,3 +123,14 @@ func WithSchedPolSwitchEnabled(enableSchedPolicySwitch bool) schedPolicyOption {
|
|||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// Launch tasks.
|
||||
func LaunchTasks(offerIDs []*mesos.OfferID, tasksToLaunch []*mesos.TaskInfo, driver sched.SchedulerDriver) error {
|
||||
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)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
|
161
utilities/trackResourceUsage.go
Normal file
161
utilities/trackResourceUsage.go
Normal file
|
@ -0,0 +1,161 @@
|
|||
package utilities
|
||||
|
||||
import (
|
||||
"bitbucket.org/sunybingcloud/elektron/def"
|
||||
"bitbucket.org/sunybingcloud/elektron/utilities/offerUtils"
|
||||
"errors"
|
||||
mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
|
||||
"sync"
|
||||
)
|
||||
|
||||
type TrackResourceUsage struct {
|
||||
perHostResourceAvailability map[string]ResourceCount
|
||||
sync.Mutex
|
||||
}
|
||||
|
||||
// Maintain information regarding the usage of the cluster resources.
|
||||
// This information is maintained for each node in the cluster.
|
||||
type ResourceCount struct {
|
||||
// Total resources available.
|
||||
totalCPU float64
|
||||
totalRAM float64
|
||||
totalWatts float64
|
||||
|
||||
// Resources currently unused.
|
||||
unusedCPU float64
|
||||
unusedRAM float64
|
||||
unusedWatts float64
|
||||
}
|
||||
|
||||
// Increment unused resources.
|
||||
func (rc *ResourceCount) IncrUnusedResources(tr def.TaskResources) {
|
||||
rc.unusedCPU += tr.CPU
|
||||
rc.unusedRAM += tr.Ram
|
||||
rc.unusedWatts += tr.Watts
|
||||
}
|
||||
|
||||
// Decrement unused resources.
|
||||
func (rc *ResourceCount) DecrUnusedResources(tr def.TaskResources) {
|
||||
rc.unusedCPU -= tr.CPU
|
||||
rc.unusedRAM -= tr.Ram
|
||||
rc.unusedWatts -= tr.Watts
|
||||
}
|
||||
|
||||
var truInstance *TrackResourceUsage
|
||||
|
||||
func getTRUInstance() *TrackResourceUsage {
|
||||
if truInstance == nil {
|
||||
truInstance = newResourceUsageTracker()
|
||||
}
|
||||
return truInstance
|
||||
}
|
||||
|
||||
func newResourceUsageTracker() *TrackResourceUsage {
|
||||
return &TrackResourceUsage{
|
||||
perHostResourceAvailability: make(map[string]ResourceCount),
|
||||
}
|
||||
}
|
||||
|
||||
// Determine the total available resources from the first round of mesos resource offers.
|
||||
func RecordTotalResourceAvailability(offers []*mesos.Offer) {
|
||||
tru := getTRUInstance()
|
||||
tru.Lock()
|
||||
defer tru.Unlock()
|
||||
for _, offer := range offers {
|
||||
// If first offer received from Mesos Agent.
|
||||
if _, ok := tru.perHostResourceAvailability[*offer.SlaveId.Value]; !ok {
|
||||
cpu, mem, watts := offerUtils.OfferAgg(offer)
|
||||
tru.perHostResourceAvailability[*offer.SlaveId.Value] = ResourceCount{
|
||||
totalCPU: cpu,
|
||||
totalRAM: mem,
|
||||
totalWatts: watts,
|
||||
|
||||
// Initially, all resources are used.
|
||||
unusedCPU: cpu,
|
||||
unusedRAM: mem,
|
||||
unusedWatts: watts,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Resource availability update scenarios.
|
||||
var resourceAvailabilityUpdateScenario = map[string]func(mesos.TaskID, mesos.SlaveID) error{
|
||||
"ON_TASK_TERMINAL_STATE": func(taskID mesos.TaskID, slaveID mesos.SlaveID) error {
|
||||
tru := getTRUInstance()
|
||||
tru.Lock()
|
||||
defer tru.Unlock()
|
||||
if taskResources, err := def.GetResourceRequirement(*taskID.Value); err != nil {
|
||||
return err
|
||||
} else {
|
||||
// Checking if first resource offer already recorded for slaveID.
|
||||
if resCount, ok := tru.perHostResourceAvailability[*slaveID.Value]; ok {
|
||||
resCount.IncrUnusedResources(taskResources)
|
||||
} else {
|
||||
// Shouldn't be here.
|
||||
// First round of mesos resource offers not recorded.
|
||||
return errors.New("Recource Availability not recorded for " + *slaveID.Value)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
},
|
||||
"ON_TASK_ACTIVE_STATE": func(taskID mesos.TaskID, slaveID mesos.SlaveID) error {
|
||||
tru := getTRUInstance()
|
||||
tru.Lock()
|
||||
defer tru.Unlock()
|
||||
if taskResources, err := def.GetResourceRequirement(*taskID.Value); err != nil {
|
||||
return err
|
||||
} else {
|
||||
// Checking if first resource offer already recorded for slaveID.
|
||||
if resCount, ok := tru.perHostResourceAvailability[*slaveID.Value]; ok {
|
||||
resCount.DecrUnusedResources(taskResources)
|
||||
} else {
|
||||
// Shouldn't be here.
|
||||
// First round of mesos resource offers not recorded.
|
||||
return errors.New("Resource Availability not recorded for " + *slaveID.Value)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
// Updating cluster resource availability based on the given scenario.
|
||||
func ResourceAvailabilityUpdate(scenario string, taskID mesos.TaskID, slaveID mesos.SlaveID) error {
|
||||
if updateFunc, ok := resourceAvailabilityUpdateScenario[scenario]; ok {
|
||||
// Applying the update function
|
||||
updateFunc(taskID, slaveID)
|
||||
return nil
|
||||
} else {
|
||||
// Incorrect scenario specified.
|
||||
return errors.New("Incorrect scenario specified for resource availability update: " + scenario)
|
||||
}
|
||||
}
|
||||
|
||||
// Retrieve clusterwide resource availability.
|
||||
func GetClusterwideResourceAvailability() ResourceCount {
|
||||
tru := getTRUInstance()
|
||||
tru.Lock()
|
||||
defer tru.Unlock()
|
||||
clusterwideResourceCount := ResourceCount{}
|
||||
for _, resCount := range tru.perHostResourceAvailability {
|
||||
// Aggregating the total CPU, RAM and Watts.
|
||||
clusterwideResourceCount.totalCPU += resCount.totalCPU
|
||||
clusterwideResourceCount.totalRAM += resCount.totalRAM
|
||||
clusterwideResourceCount.totalWatts += resCount.totalWatts
|
||||
|
||||
// Aggregating the total unused CPU, RAM and Watts.
|
||||
clusterwideResourceCount.unusedCPU += resCount.unusedCPU
|
||||
clusterwideResourceCount.unusedRAM += resCount.unusedRAM
|
||||
clusterwideResourceCount.unusedWatts += resCount.unusedWatts
|
||||
}
|
||||
|
||||
return clusterwideResourceCount
|
||||
}
|
||||
|
||||
// Retrieve resource availability for each host in the cluster.
|
||||
func GetPerHostResourceAvailability() map[string]ResourceCount {
|
||||
tru := getTRUInstance()
|
||||
tru.Lock()
|
||||
defer tru.Unlock()
|
||||
return tru.perHostResourceAvailability
|
||||
}
|
Reference in a new issue