calculate priority

Signed-off-by: lowang_bh <lhui_wang@163.com>

Author: lowang-bh

pkg/controller/podgroup.go

@@ -347,18 +347,10 @@ func calPgMinResource(minMember *int32, mpiJob *kubeflow.MPIJob, pFunc PriorityC
 			ReplicaSpec: *replica,
 		}
 
-		pcName := replica.Template.Spec.PriorityClassName
-		if len(pcName) != 0 && pFunc != nil{
-			if priorityClass, err := pFunc(pcName); err != nil {
-				klog.Warningf("Ignore replica %q priority class %q: %v", rt, pcName, err)
-			} else {
-				rp.priority = priorityClass.Value
-			}
-		}
+		rp.priority = calculatePriority(&replica.Template.Spec, pFunc)
 		order = append(order, rp)
 	}
 
-
 	sort.Sort(sort.Reverse(order))
 	// Launcher + Worker > minMember
 	if minMember != nil && *order[0].Replicas+*order[1].Replicas > *minMember {
@@ -417,6 +409,28 @@ func calculatePriorityClassName(
 	}
 }
 
+// calculatePriority set priority
+// 1. set priority with priorityClass's value
+// 2. set priority with priority
+func calculatePriority(podSpec *corev1.PodSpec, pFunc PriorityClassGetFunc) int32 {
+	var priority int32
+	pcName := podSpec.PriorityClassName
+	if len(pcName) != 0 && pFunc != nil {
+		if priorityClass, err := pFunc(pcName); err != nil {
+			klog.Warningf("Ignore priority class %q: %v", pcName, err)
+			if podSpec.Priority != nil {
+				priority = *podSpec.Priority
+			}
+		} else {
+			priority = priorityClass.Value
+		}
+	} else if podSpec.Priority != nil {
+		priority = *podSpec.Priority
+	}
+
+	return priority
+}
+
 // addResources adds resources to minResources.
 // If resources don't have requests, it defaults limit if that is explicitly specified.
 func addResources(minResources corev1.ResourceList, resources corev1.ResourceRequirements) {