update fair

src/scheduler_fair.go

@@ -79,7 +79,22 @@ func (scheduler *SchedulerFair) Start() {
 			bestQueue := ""
 			maxNumberGPU := math.MaxInt64
 			maxNumberCPU := math.MaxInt64
+
+			/* drf of yarn/kube-batch */
+			if scheduler.drfyarn {
+				least := math.MaxInt32
+				for queue, allocate := range scheduler.resourceAllocations {
+					if jobs, ok := scheduler.queues[queue]; ok && len(jobs) > 0 {
+						if bestQueue == "" || allocate.NumberGPU < least {
+							bestQueue = queue
+							least = allocate.NumberGPU
+						}
+					}
+				}
+			}
+
 			/* phase 1: execute jobs using self quota */
+			if bestQueue == "" {
 				for queue, jobs := range scheduler.queues {
 					/* find largest job */
 					if len(jobs) > 0 {
@@ -102,6 +117,7 @@ func (scheduler *SchedulerFair) Start() {
 						}
 					}
 				}
+			}
 
 			/* phase 2: borrow */
 			if bestQueue == "" && scheduler.enableBorrow {
@@ -214,19 +230,6 @@ func (scheduler *SchedulerFair) Start() {
 				}
 			}
 
-			/* drf of yarn/kube-batch */
-			if bestQueue == "" && scheduler.drfyarn {
-				least := math.MaxInt32
-				for queue, allocate := range scheduler.resourceAllocations {
-					if jobs, ok := scheduler.queues[queue]; ok && len(jobs) > 0 {
-						if bestQueue == "" || allocate.NumberGPU < least {
-							bestQueue = queue
-							least = allocate.NumberGPU
-						}
-					}
-				}
-			}
-
 			/* launch that job */
 			if bestQueue != "" {
 				numberGPUtmp := 0