Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/scheduler/actions/common/feasible_nodes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ func TestFeasibleNodes(t *testing.T) {
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 1).WithPodInfos(pod_info.PodsMap{
"pod1": &pod_info.PodInfo{
UID: "pod1",
ResourceRequestType: pod_info.RequestTypeRegular,
ResReq: resource_info.NewResourceRequirementsWithGpus(1),
},
Expand All @@ -105,6 +106,7 @@ func TestFeasibleNodes(t *testing.T) {
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 1).WithPodInfos(pod_info.PodsMap{
"pod1": &pod_info.PodInfo{
UID: "pod1",
ResourceRequestType: pod_info.RequestTypeRegular,
ResReq: resource_info.NewResourceRequirements(0, 1000, 0),
},
Expand All @@ -120,6 +122,7 @@ func TestFeasibleNodes(t *testing.T) {
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 1).WithPodInfos(pod_info.PodsMap{
"pod1": &pod_info.PodInfo{
UID: "pod1",
ResourceRequestType: pod_info.RequestTypeRegular,
ResReq: &resource_info.ResourceRequirements{
GpuResourceRequirement: *resource_info.NewGpuResourceRequirementWithGpus(2, 0),
Expand All @@ -137,12 +140,14 @@ func TestFeasibleNodes(t *testing.T) {
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 2).WithPodInfos(pod_info.PodsMap{
"pod1": &pod_info.PodInfo{
UID: "pod1",
ResourceRequestType: pod_info.RequestTypeRegular,
ResReq: &resource_info.ResourceRequirements{
GpuResourceRequirement: *resource_info.NewGpuResourceRequirementWithGpus(2, 0),
},
},
"pod2": &pod_info.PodInfo{
UID: "pod2",
ResReq: &resource_info.ResourceRequirements{
GpuResourceRequirement: *resource_info.NewGpuResourceRequirementWithGpus(2, 0),
},
Expand All @@ -159,12 +164,14 @@ func TestFeasibleNodes(t *testing.T) {
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 2).WithPodInfos(pod_info.PodsMap{
"pod1": &pod_info.PodInfo{
UID: "pod1",
ResourceRequestType: pod_info.RequestTypeRegular,
ResReq: &resource_info.ResourceRequirements{
GpuResourceRequirement: *resource_info.NewGpuResourceRequirementWithGpus(2, 0),
},
},
"pod2": &pod_info.PodInfo{
UID: "pod2",
ResReq: resource_info.NewResourceRequirements(0, 1000, 2000),
},
}),
Expand All @@ -179,6 +186,7 @@ func TestFeasibleNodes(t *testing.T) {
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 1).WithPodInfos(pod_info.PodsMap{
"pod1": &pod_info.PodInfo{
UID: "pod1",
ResourceRequestType: pod_info.RequestTypeFraction,
ResReq: &resource_info.ResourceRequirements{
GpuResourceRequirement: *resource_info.NewGpuResourceRequirementWithGpus(0.5, 0),
Expand All @@ -196,6 +204,7 @@ func TestFeasibleNodes(t *testing.T) {
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 1).WithPodInfos(pod_info.PodsMap{
"pod1": &pod_info.PodInfo{
UID: "pod1",
ResourceRequestType: pod_info.RequestTypeGpuMemory,
ResReq: &resource_info.ResourceRequirements{
GpuResourceRequirement: *resource_info.NewGpuResourceRequirementWithGpus(
Expand All @@ -214,6 +223,7 @@ func TestFeasibleNodes(t *testing.T) {
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 1).WithPodInfos(pod_info.PodsMap{
"pod1": &pod_info.PodInfo{
UID: "pod1",
ResourceRequestType: pod_info.RequestTypeMigInstance,
ResReq: &resource_info.ResourceRequirements{
GpuResourceRequirement: *resource_info.NewGpuResourceRequirementWithMig(
Expand Down
112 changes: 84 additions & 28 deletions pkg/scheduler/actions/utils/job_order_by_queue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ func TestNumericalPriorityWithinSameQueue(t *testing.T) {
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
testPod: {},
testPod: {
UID: testPod,
},
}),
},
},
Expand All @@ -71,7 +73,9 @@ func TestNumericalPriorityWithinSameQueue(t *testing.T) {
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
testPod: {},
testPod: {
UID: testPod,
},
}),
},
},
Expand All @@ -86,7 +90,9 @@ func TestNumericalPriorityWithinSameQueue(t *testing.T) {
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
testPod: {},
testPod: {
UID: testPod,
},
}),
},
},
Expand All @@ -101,7 +107,9 @@ func TestNumericalPriorityWithinSameQueue(t *testing.T) {
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
testPod: {},
testPod: {
UID: testPod,
},
}),
},
},
Expand Down Expand Up @@ -364,12 +372,16 @@ func TestJobsOrderByQueues_PushJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand All @@ -382,12 +394,16 @@ func TestJobsOrderByQueues_PushJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand Down Expand Up @@ -415,12 +431,16 @@ func TestJobsOrderByQueues_PushJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand All @@ -434,12 +454,16 @@ func TestJobsOrderByQueues_PushJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand All @@ -453,12 +477,16 @@ func TestJobsOrderByQueues_PushJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand All @@ -469,12 +497,16 @@ func TestJobsOrderByQueues_PushJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand Down Expand Up @@ -502,12 +534,16 @@ func TestJobsOrderByQueues_PushJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand All @@ -521,12 +557,16 @@ func TestJobsOrderByQueues_PushJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand All @@ -540,12 +580,16 @@ func TestJobsOrderByQueues_PushJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand All @@ -556,12 +600,16 @@ func TestJobsOrderByQueues_PushJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand Down Expand Up @@ -640,12 +688,16 @@ func TestJobsOrderByQueues_RequeueJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand All @@ -660,12 +712,16 @@ func TestJobsOrderByQueues_RequeueJob(t *testing.T) {
Queue: "q1",
PodStatusIndex: map[pod_status.PodStatus]pod_info.PodsMap{
pod_status.Pending: {
"p1": {},
testPod: {
UID: testPod,
},
},
},
SubGroups: map[string]*podgroup_info.SubGroupInfo{
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 0).WithPodInfos(pod_info.PodsMap{
"p1": {},
testPod: {
UID: testPod,
},
}),
},
},
Expand Down
Loading
Loading