From 2749f1bb1c7b78aaee4623603c53b54bd96d513a Mon Sep 17 00:00:00 2001 From: xuzhonghu Date: Mon, 20 Jul 2020 17:43:44 +0800 Subject: [PATCH] Fix: set pod's scheduler name to job's if not set --- pkg/controllers/job/job_controller_util.go | 5 +++++ test/e2e/job/util.go | 3 +-- test/e2e/scheduling/util.go | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/controllers/job/job_controller_util.go b/pkg/controllers/job/job_controller_util.go index c33294d462..69523d379b 100644 --- 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 index 7bd137db3e..4edc703e23 100644 --- 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 index b3e6883d19..94be1f07f4 100644 --- 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,