Skip to content

Commit

Permalink
optimize code style according to reivew adivce in PR892
Browse files Browse the repository at this point in the history 
Signed-off-by: Thor <1187526662@qq.com>
  • Loading branch information
@Thor-wl
Thor-wl committed Jul 1, 2020
1 parent c8b8444 commit 7972134
Showing 1 changed file with 30 additions and 25 deletions.
55 changes: 30 additions & 25 deletions test/e2e/preempt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,17 @@ import (
schedulingv1beta1 "volcano.sh/volcano/pkg/apis/scheduling/v1beta1"
)

const (
highPriority = "high-priority"
lowPriority = "low-priority"
)

var _ = Describe("Job E2E Test", func() {
It("schedule high priority job without preemption when resource is enough", func() {
ctx := initTestContext(options{
priorityClasses: map[string]int32{
masterPriority: masterPriorityValue,
workerPriority: workerPriorityValue,
highPriority: 100,
lowPriority: 10,
},
})
defer cleanupTestContext(ctx)
Expand All @@ -35,13 +40,13 @@ var _ = Describe("Job E2E Test", func() {
}

job.name = "preemptee"
job.pri = workerPriority
job.pri = lowPriority
preempteeJob, _ := createJob(ctx, job)
err := waitTasksReady(ctx, preempteeJob, 1)
Expect(err).NotTo(HaveOccurred())

job.name = "preemptor"
job.pri = masterPriority
job.pri = highPriority
preemptorJob, _ := createJob(ctx, job)
err = waitTasksReady(ctx, preempteeJob, 1)
Expect(err).NotTo(HaveOccurred())
Expand All @@ -53,8 +58,8 @@ var _ = Describe("Job E2E Test", func() {
It("schedule high priority job with preemption when resource is NOT enough", func() {
ctx := initTestContext(options{
priorityClasses: map[string]int32{
masterPriority: masterPriorityValue,
workerPriority: workerPriorityValue,
highPriority: 100,
lowPriority: 10,
},
})
defer cleanupTestContext(ctx)
Expand All @@ -74,13 +79,13 @@ var _ = Describe("Job E2E Test", func() {
}

job.name = "preemptee"
job.pri = workerPriority
job.pri = lowPriority
preempteeJob, _ := createJob(ctx, job)
err := waitTasksReady(ctx, preempteeJob, int(rep))
Expect(err).NotTo(HaveOccurred())

job.name = "preemptor"
job.pri = masterPriority
job.pri = highPriority
job.min = rep / 2
preemptorJob, _ := createJob(ctx, job)
err = waitTasksReady(ctx, preempteeJob, int(rep)/2)
Expand All @@ -93,8 +98,8 @@ var _ = Describe("Job E2E Test", func() {
It("preemption don't work when podgroup is pending", func() {
ctx := initTestContext(options{
priorityClasses: map[string]int32{
masterPriority: masterPriorityValue,
workerPriority: workerPriorityValue,
highPriority: 100,
lowPriority: 10,
},
})
defer cleanupTestContext(ctx)
Expand All @@ -109,12 +114,11 @@ var _ = Describe("Job E2E Test", func() {
MinMember: 1,
MinResources: &thirtyCPU,
},
Status: schedulingv1beta1.PodGroupStatus{
Phase: schedulingv1beta1.PodGroupPending,
},
}
_, err := ctx.vcclient.SchedulingV1beta1().PodGroups(ctx.namespace).Create(context.TODO(), pg, v1.CreateOptions{})
Expect(err).NotTo(HaveOccurred())
pendingPodGroup, err := ctx.vcclient.SchedulingV1beta1().PodGroups(ctx.namespace).Get(context.TODO(), pgName, v1.GetOptions{})
Expect(pendingPodGroup.Status.Phase).To(Equal(schedulingv1beta1.PodGroupPending))

slot := oneCPU
rep := clusterSize(ctx, slot)
Expand All @@ -129,7 +133,7 @@ var _ = Describe("Job E2E Test", func() {
},
}
job.name = "preemptee"
job.pri = workerPriority
job.pri = lowPriority
preempteeJob, _ := createJob(ctx, job)
err = waitTasksReady(ctx, preempteeJob, int(rep))
Expect(err).NotTo(HaveOccurred())
Expand All @@ -147,7 +151,7 @@ var _ = Describe("Job E2E Test", func() {
Spec: corev1.PodSpec{
SchedulerName: "volcano",
Containers: createContainers(defaultNginxImage, "", "", oneCPU, oneCPU, 0),
PriorityClassName: masterPriority,
PriorityClassName: highPriority,
},
}
_, err = ctx.kubeclient.CoreV1().Pods(ctx.namespace).Create(context.TODO(), pod, v1.CreateOptions{})
Expand All @@ -158,8 +162,8 @@ var _ = Describe("Job E2E Test", func() {
ctx := initTestContext(options{
queues: []string{"q1-preemption", "q2-reference"},
priorityClasses: map[string]int32{
masterPriority: masterPriorityValue,
workerPriority: workerPriorityValue,
highPriority: 100,
lowPriority: 10,
},
})
defer cleanupTestContext(ctx)
Expand All @@ -178,21 +182,21 @@ var _ = Describe("Job E2E Test", func() {
}

job.name = "j1-q1"
job.pri = workerPriority
job.pri = lowPriority
job.queue = "q1-preemption"
queue1Job, _ := createJob(ctx, job)
err := waitTasksReady(ctx, queue1Job, int(rep)/2)
Expect(err).NotTo(HaveOccurred())

job.name = "j2-q2"
job.pri = workerPriority
job.pri = lowPriority
job.queue = "q2-reference"
queue2Job, _ := createJob(ctx, job)
err = waitTasksReady(ctx, queue2Job, int(rep)/2)
Expect(err).NotTo(HaveOccurred())

job.name = "j3-q1"
job.pri = masterPriority
job.pri = highPriority
job.queue = "q1-preemption"
job.tasks[0].rep = rep
queue1Job3, _ := createJob(ctx, job)
Expand All @@ -208,8 +212,8 @@ var _ = Describe("Job E2E Test", func() {
ctx := initTestContext(options{
queues: []string{"q1-e2e", "q2-e2e"},
priorityClasses: map[string]int32{
masterPriority: masterPriorityValue,
workerPriority: workerPriorityValue,
highPriority: 100,
lowPriority: 10,
},
})
defer cleanupTestContext(ctx)
Expand All @@ -228,21 +232,21 @@ var _ = Describe("Job E2E Test", func() {
}

job.name = "j1-q1"
job.pri = workerPriority
job.pri = lowPriority
job.queue = "q1-e2e"
queue1Job, _ := createJob(ctx, job)
err := waitTasksReady(ctx, queue1Job, int(rep)/2)
Expect(err).NotTo(HaveOccurred())

job.name = "j2-q2"
job.pri = workerPriority
job.pri = lowPriority
job.queue = "q2-e2e"
queue2Job, _ := createJob(ctx, job)
err = waitTasksReady(ctx, queue2Job, int(rep)/2)
Expect(err).NotTo(HaveOccurred())

job.name = "j3-q1"
job.pri = masterPriority
job.pri = highPriority
job.queue = "q3-preemption"
job.tasks[0].rep = rep
_, err = createJob(ctx, job)
Expand All @@ -252,4 +256,5 @@ var _ = Describe("Job E2E Test", func() {
err = waitTasksReady(ctx, queue2Job, int(rep)/2)
Expect(err).NotTo(HaveOccurred())
})

})

0 comments on commit 7972134

Please # to comment.