YAO/YAO-scheduler
1
0
Fork 0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-06-06 22:01:55 +00:00
Code Issues Releases Wiki Activity

update

Browse Source
This commit is contained in:
Newnius 2020-06-18 19:50:16 +08:00
parent bfd63fda5f
commit 39d7ebd93d
2 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/scheduler_fair.go
View File

@ -13,7 +13,7 @@ type SchedulerFair struct {
historyMu sync.Mutex
jobs map[string]*JobManager
queues map[string][]Job
queues map[string]JobList
queuesMu sync.Mutex
drfyarn bool
@ -35,12 +35,26 @@ type SchedulerFair struct {
allocatingGPUMu sync.Mutex
}
type JobList []Job
func (jobs JobList) Len() int {
return len(jobs)
}
func (jobs JobList) Less(i, j int) bool {
return jobs[i].BasePriority < jobs[j].BasePriority
}
func (jobs JobList) Swap(i, j int) {
jobs[i], jobs[j] = jobs[j], jobs[i]
}
func (scheduler *SchedulerFair) Start() {
log.Info("JS (fairness) started")
scheduler.jobs = map[string]*JobManager{}
scheduler.history = []*Job{}
scheduler.queues = map[string][]Job{}
scheduler.queues = map[string]JobList{}
scheduler.queues["default"] = []Job{}
scheduler.drfyarn = false
scheduler.enableBorrow = true
@ -411,6 +425,7 @@ func (scheduler *SchedulerFair) Schedule(job Job) {
scheduler.queues[queue][index] = job
job.Status = Created
job.BasePriority = float64(len(scheduler.queues[queue])) / 10000
}
func (scheduler *SchedulerFair) AcquireResource(job Job) []NodeStatus {
@ -498,7 +513,7 @@ func (scheduler *SchedulerFair) UpdateQuota() {
}
weights += InstanceOfGroupManager().groups[queue].Weight
request := ResourceCount{}
for _, job := range jobs {
for i, job := range jobs {
GPU := 0
CPU := 0
Memory := 0
@ -510,7 +525,12 @@ func (scheduler *SchedulerFair) UpdateQuota() {
request.NumberGPU += GPU
request.CPU += CPU
request.Memory += Memory
if job.Priority == jobs[0].Priority {
scheduler.queues[queue][i].BasePriority += 1
}
}
sort.Sort(sort.Reverse(scheduler.queues[queue]))
if quota, ok := scheduler.queuesQuota[queue]; ok && quota.NumberGPU >= request.NumberGPU*1000 {
continue
}

25
src/util.go
View File

@ -9,18 +9,19 @@ import (
)
type Job struct {
ID int `json:"id"`
Name string `json:"name"`
Tasks []Task `json:"tasks"`
Workspace string `json:"workspace"`
Group string `json:"group"`
Priority JobPriority `json:"priority"`
RunBefore int `json:"run_before"`
CreatedAt int `json:"created_at"`
UpdatedAt int `json:"updated_at"`
CreatedBy int `json:"created_by"`
Locality int `json:"locality"`
Status State `json:"status"`
ID int `json:"id"`
Name string `json:"name"`
Tasks []Task `json:"tasks"`
Workspace string `json:"workspace"`
Group string `json:"group"`
BasePriority float64 `json:"base_priority"`
Priority JobPriority `json:"priority"`
RunBefore int `json:"run_before"`
CreatedAt int `json:"created_at"`
UpdatedAt int `json:"updated_at"`
CreatedBy int `json:"created_by"`
Locality int `json:"locality"`
Status State `json:"status"`
}
type Task struct {