ignore completed Pod and SharePod in resource accounting

pkg/scheduler/sync_resources.go

@@ -26,7 +26,7 @@ func syncPodResources(nodeRes NodeResources, podList []*corev1.Pod, sharePodList
 		if nodeName == "" || strings.Contains(pod.Name, kubesharev1.KubeShareDummyPodName) {
 			continue
 		}
-		// If a Pod is owned by a MtpguPod, calculating their resource usage later.
+		// If a Pod is owned by a SharePod, calculating their resource usage later.
 		ownedBySharePod := false
 		for _, owneref := range pod.ObjectMeta.OwnerReferences {
 			if owneref.Kind == "SharePod" {
@@ -43,6 +43,14 @@ func syncPodResources(nodeRes NodeResources, podList []*corev1.Pod, sharePodList
 			continue
 		}
 
+		if (pod.Spec.RestartPolicy == corev1.RestartPolicyOnFailure &&
+			pod.Status.Phase == corev1.PodSucceeded) ||
+			(pod.Spec.RestartPolicy == corev1.RestartPolicyNever &&
+				(pod.Status.Phase == corev1.PodSucceeded ||
+					pod.Status.Phase == corev1.PodFailed)) {
+			continue
+		}
+
 		for _, container := range pod.Spec.Containers {
 			nodeRes[nodeName].CpuFree -= container.Resources.Requests.Cpu().MilliValue()
 			nodeRes[nodeName].MemFree -= container.Resources.Requests.Memory().MilliValue()
@@ -63,9 +71,10 @@ func syncPodResources(nodeRes NodeResources, podList []*corev1.Pod, sharePodList
 			continue
 		}
 		if sharePod.Status.PodStatus != nil {
-			if (sharePod.Spec.RestartPolicy == corev1.RestartPolicyAlways) ||
-				(sharePod.Spec.RestartPolicy == corev1.RestartPolicyOnFailure &&
-					sharePod.Status.PodStatus.Phase == corev1.PodSucceeded) ||
+			// why policy Always is ignored? why??? I forgot why wrote this then
+			// if (sharePod.Spec.RestartPolicy == corev1.RestartPolicyAlways) ||
+			if (sharePod.Spec.RestartPolicy == corev1.RestartPolicyOnFailure &&
+				sharePod.Status.PodStatus.Phase == corev1.PodSucceeded) ||
 				(sharePod.Spec.RestartPolicy == corev1.RestartPolicyNever &&
 					(sharePod.Status.PodStatus.Phase == corev1.PodSucceeded ||
 						sharePod.Status.PodStatus.Phase == corev1.PodFailed)) {