Merge pull request #944 from hzxuzhonghu/job-scheduler

Fix: set pod's scheduler name to job's if not set
volcano-sh · Jul 20, 2020 · 9c97afb · 9c97afb
2 parents ffb5bb9 + 2749f1b
commit 9c97afb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/pkg/controllers/job/job_controller_util.go b/pkg/controllers/job/job_controller_util.go
@@ -53,6 +53,11 @@ func createJobPod(job *batch.Job, template *v1.PodTemplateSpec, ix int) *v1.Pod
 		Spec: templateCopy.Spec,
 	}
 
+	// If no scheduler name in Pod, use scheduler name from Job.
+	if len(pod.Spec.SchedulerName) == 0 {
+		pod.Spec.SchedulerName = job.Spec.SchedulerName
+	}
+
 	volumeMap := make(map[string]string)
 	for _, volume := range job.Spec.Volumes {
 		vcName := volume.VolumeClaimName

diff --git a/test/e2e/job/util.go b/test/e2e/job/util.go
@@ -433,13 +433,13 @@ func createJobWithPodGroup(ctx *testContext, jobSpec *jobSpec, pgName string) *b
 
 func createJobInner(ctx *testContext, jobSpec *jobSpec) (*batchv1alpha1.Job, error) {
 	ns := getNS(ctx, jobSpec)
-
 	job := &batchv1alpha1.Job{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      jobSpec.name,
 			Namespace: ns,
 		},
 		Spec: batchv1alpha1.JobSpec{
+			SchedulerName:           "volcano",
 			Policies:                jobSpec.policies,
 			Queue:                   jobSpec.queue,
 			Plugins:                 jobSpec.plugins,
@@ -469,7 +469,6 @@ func createJobInner(ctx *testContext, jobSpec *jobSpec) (*batchv1alpha1.Job, err
 					Labels: task.labels,
 				},
 				Spec: v1.PodSpec{
-					SchedulerName:     "volcano",
 					RestartPolicy:     restartPolicy,
 					Containers:        createContainers(task.img, task.command, task.workingDir, task.req, task.limit, task.hostport),
 					Affinity:          task.affinity,

diff --git a/test/e2e/scheduling/util.go b/test/e2e/scheduling/util.go
@@ -440,6 +440,7 @@ func createJobInner(ctx *testContext, jobSpec *jobSpec) (*batchv1alpha1.Job, err
 			Namespace: ns,
 		},
 		Spec: batchv1alpha1.JobSpec{
+			SchedulerName:           "volcano",
 			Policies:                jobSpec.policies,
 			Queue:                   jobSpec.queue,
 			Plugins:                 jobSpec.plugins,
@@ -469,7 +470,6 @@ func createJobInner(ctx *testContext, jobSpec *jobSpec) (*batchv1alpha1.Job, err
 					Labels: task.labels,
 				},
 				Spec: v1.PodSpec{
-					SchedulerName:     "volcano",
 					RestartPolicy:     restartPolicy,
 					Containers:        createContainers(task.img, task.command, task.workingDir, task.req, task.limit, task.hostport),
 					Affinity:          task.affinity,