From 87131f3cd47399ef2a597160b2cc5afa138c75de Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Wed, 3 Jun 2020 17:07:55 +0800
Subject: [PATCH] update fair

---
 src/scheduler_priority.go | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/scheduler_priority.go b/src/scheduler_priority.go
index 8e9e340..5e6b055 100644
--- a/src/scheduler_priority.go
+++ b/src/scheduler_priority.go
@@ -70,7 +70,8 @@ func (scheduler *SchedulerPriority) Start() {
 				} else {
 					/* start preempt */
 					var jobs []Job
-					lowest := scheduler.queue[0].Priority
+					preemptee := scheduler.queue[0]
+					lowest := preemptee.Priority - 1
 					scheduler.historyMu.Lock()
 					for _, job := range scheduler.history {
 						if job.Priority < lowest {
@@ -80,16 +81,41 @@ func (scheduler *SchedulerPriority) Start() {
 							jobs = append(jobs, *job)
 						}
 					}
-					scheduler.historyMu.Unlock()
 					sort.Sort(JobSorter(jobs))
 					if len(jobs) > 0 {
-						job := jobs[0]
-						log.Info("Start preempt ", job.Name)
-						scheduler.Stop(job.Name)
-						scheduler.Schedule(job)
+						preempted := jobs[0]
+						log.Info("Start preempt ", preempted.Name)
+						scheduler.Stop(preempted.Name)
 
 						/* Remove from history */
+						idx := -1
+						for i, job := range scheduler.history {
+							if job.Name == preempted.Name {
+								idx = i
+							}
+						}
+						if idx != -1 {
+							copy(scheduler.history[idx:], scheduler.history[idx+1:])
+							scheduler.history = scheduler.history[:len(scheduler.history)-1]
+						}
+
+						/* add back */
+						idx = len(scheduler.queue)
+						for i, job := range scheduler.queue {
+							if job.Priority > preempted.Priority {
+								continue
+							}
+							idx = i
+							break
+						}
+						scheduler.queue = append(scheduler.queue, Job{})
+
+						copy(scheduler.queue[idx+1:], scheduler.queue[idx:])
+						scheduler.queue[idx] = preempted
+
+						preempted.Status = Created
 					}
+					scheduler.historyMu.Unlock()
 				}
 			}
 			scheduler.queueMu.Unlock()