From d892da43f7b28f1a1c25b4d15b897793804b13c8 Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Thu, 1 Aug 2019 15:03:56 +0800
Subject: [PATCH] bugfix

---
 src/job_manager.go    | 15 +++++++++++----
 src/scheduler_fair.go |  7 +------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/job_manager.go b/src/job_manager.go
index a1dc1c5..fb81aec 100644
--- a/src/job_manager.go
+++ b/src/job_manager.go
@@ -12,10 +12,11 @@ import (
 )
 
 type JobManager struct {
-	scheduler Scheduler
-	job       Job
-	jobStatus JobStatus
-	resources []NodeStatus
+	scheduler  Scheduler
+	job        Job
+	jobStatus  JobStatus
+	resources  []NodeStatus
+	killedFlag bool
 }
 
 func (jm *JobManager) start() {
@@ -28,6 +29,9 @@ func (jm *JobManager) start() {
 	for i := range jm.job.Tasks {
 		var resource NodeStatus
 		for {
+			if jm.killedFlag {
+				break
+			}
 			resource = jm.scheduler.AcquireResource(jm.job, jm.job.Tasks[i])
 			if len(resource.Status) > 0 {
 				break
@@ -41,6 +45,9 @@ func (jm *JobManager) start() {
 
 	/* bring up containers */
 	for i := range jm.job.Tasks {
+		if jm.killedFlag {
+			break
+		}
 		var GPUs []string
 		for _, GPU := range jm.resources[i].Status {
 			GPUs = append(GPUs, GPU.UUID)
diff --git a/src/scheduler_fair.go b/src/scheduler_fair.go
index e29380a..a154e28 100644
--- a/src/scheduler_fair.go
+++ b/src/scheduler_fair.go
@@ -33,10 +33,7 @@ func (s FairJobSorter) Swap(i, j int) {
 	s[i], s[j] = s[j], s[i]
 }
 func (s FairJobSorter) Less(i, j int) bool {
-	if s[i].Priority > s[j].Priority {
-		return true
-	}
-	return s[i].CreatedAt > s[j].CreatedAt
+	return s[i].CreatedAt < s[j].CreatedAt
 }
 
 func (scheduler *SchedulerFair) Start() {
@@ -362,7 +359,5 @@ func (scheduler *SchedulerFair) UpdateNextQueue() {
 		}
 	}
 	scheduler.nextQueue = next
-	log.Info("updateNextQueue")
-	log.Info(scheduler.resourceAllocations)
 	log.Info("updateNextQueue ->", next)
 }