Merge pull request kubernetes-retired#443 from k82cn/kb_387

Checked pod group unschedulable event.

Author: k8s-ci-robot

pkg/scheduler/framework/session.go

@@ -290,8 +290,8 @@ func (ssn *Session) Preemptable(preemptor *api.TaskInfo, preemptees []*api.TaskI
 	return victims
 }
 
-// Discard discards a job from session, so no plugin/action handles it.
-func (ssn *Session) Discard(job *api.JobInfo, event arbcorev1.Event, reason string) error {
+// Backoff discards a job from session, so no plugin/action handles it.
+func (ssn *Session) Backoff(job *api.JobInfo, event arbcorev1.Event, reason string) error {
 	if err := ssn.cache.Backoff(job, event, reason); err != nil {
 		glog.Errorf("Failed to backoff job <%s/%s>: %v",
 			job.Namespace, job.Name, err)

pkg/scheduler/plugins/gang/gang.go

@@ -69,7 +69,7 @@ func jobReady(obj interface{}) bool {
 func (gp *gangPlugin) OnSessionOpen(ssn *framework.Session) {
 	for _, job := range ssn.Jobs {
 		if validTaskNum(job) < job.MinAvailable {
-			ssn.Discard(job, arbcorev1.UnschedulableEvent, "not enough valid tasks for gang-scheduling")
+			ssn.Backoff(job, arbcorev1.UnschedulableEvent, "not enough valid tasks for gang-scheduling")
 		}
 	}
 
@@ -139,5 +139,9 @@ func (gp *gangPlugin) OnSessionOpen(ssn *framework.Session) {
 }
 
 func (gp *gangPlugin) OnSessionClose(ssn *framework.Session) {
-
+	for _, job := range ssn.Jobs {
+		if len(job.TaskStatusIndex[api.Allocated]) != 0 {
+			ssn.Backoff(job, arbcorev1.UnschedulableEvent, "not enough resource for job")
+		}
+	}
 }

test/e2e/job.go

@@ -103,6 +103,9 @@ var _ = Describe("Job E2E Test", func() {
 		err = waitPodGroupPending(context, pg)
 		Expect(err).NotTo(HaveOccurred())
 
+		waitPodGroupUnschedulable(context, pg)
+		Expect(err).NotTo(HaveOccurred())
+
 		err = deleteReplicaSet(context, replicaset.Name)
 		Expect(err).NotTo(HaveOccurred())