YAO/YAO-scheduler
1
0
Fork 0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-12-15 08:16:43 +00:00
Code Issues Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Newnius
2019-08-01 15:03:56 +08:00
parent 1ff5279823
commit d892da43f7
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/job_manager.go
View File

@@ -12,10 +12,11 @@ import (
) )
type JobManager struct { type JobManager struct {
scheduler Scheduler scheduler Scheduler
job Job job Job
jobStatus JobStatus jobStatus JobStatus
resources []NodeStatus resources []NodeStatus
killedFlag bool
} }
func (jm *JobManager) start() { func (jm *JobManager) start() {
@@ -28,6 +29,9 @@ func (jm *JobManager) start() {
for i := range jm.job.Tasks { for i := range jm.job.Tasks {
var resource NodeStatus var resource NodeStatus
for { for {
if jm.killedFlag {
break
}
resource = jm.scheduler.AcquireResource(jm.job, jm.job.Tasks[i]) resource = jm.scheduler.AcquireResource(jm.job, jm.job.Tasks[i])
if len(resource.Status) > 0 { if len(resource.Status) > 0 {
break break
@@ -41,6 +45,9 @@ func (jm *JobManager) start() {
/* bring up containers */ /* bring up containers */
for i := range jm.job.Tasks { for i := range jm.job.Tasks {
if jm.killedFlag {
break
}
var GPUs []string var GPUs []string
for _, GPU := range jm.resources[i].Status { for _, GPU := range jm.resources[i].Status {
GPUs = append(GPUs, GPU.UUID) GPUs = append(GPUs, GPU.UUID)

7
src/scheduler_fair.go
View File

@@ -33,10 +33,7 @@ func (s FairJobSorter) Swap(i, j int) {
s[i], s[j] = s[j], s[i] s[i], s[j] = s[j], s[i]
} }
func (s FairJobSorter) Less(i, j int) bool { func (s FairJobSorter) Less(i, j int) bool {
if s[i].Priority > s[j].Priority { return s[i].CreatedAt < s[j].CreatedAt
return true
}
return s[i].CreatedAt > s[j].CreatedAt
} }
func (scheduler *SchedulerFair) Start() { func (scheduler *SchedulerFair) Start() {
@@ -362,7 +359,5 @@ func (scheduler *SchedulerFair) UpdateNextQueue() {
} }
} }
scheduler.nextQueue = next scheduler.nextQueue = next
log.Info("updateNextQueue")
log.Info(scheduler.resourceAllocations)
log.Info("updateNextQueue ->", next) log.Info("updateNextQueue ->", next)
} }