Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduce resource multiplication #634

Merged
merged 1 commit into from
Apr 17, 2024
Merged

Introduce resource multiplication #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions pkg/controller/podgroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,8 @@ func calPGMinResource(minMember *int32, mpiJob *kubeflow.MPIJob, pcLister schedu
if rp.Replicas == nil {
continue
}
for i := int32(0); i < *rp.Replicas; i++ {
for _, c := range rp.Template.Spec.Containers {
addResources(minResources, c.Resources)
}
for _, c := range rp.Template.Spec.Containers {
addResources(minResources, c.Resources, int64(*rp.Replicas))
}
}
return &minResources
Expand Down Expand Up @@ -414,7 +412,7 @@ func calculatePriorityClassName(

// addResources adds resources to minResources.
// If resources don't have requests, it defaults limit if that is explicitly specified.
func addResources(minResources corev1.ResourceList, resources corev1.ResourceRequirements) {
func addResources(minResources corev1.ResourceList, resources corev1.ResourceRequirements, replicas int64) {
if minResources == nil || cmp.Equal(resources, corev1.ResourceRequirements{}) {
return
}
Expand All @@ -429,6 +427,7 @@ func addResources(minResources corev1.ResourceList, resources corev1.ResourceReq
}
}
for name, quantity := range merged {
quantity.Mul(replicas)
if q, ok := minResources[name]; !ok {
minResources[name] = quantity.DeepCopy()
} else {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/podgroup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ func TestAddResources(t *testing.T) {
}
for name, tc := range tests {
t.Run(name, func(t *testing.T) {
addResources(tc.minResources, tc.resources)
addResources(tc.minResources, tc.resources, 1)
if diff := cmp.Diff(tc.want, tc.minResources); len(diff) != 0 {
t.Fatalf("Unexpected resourceList (-want,+got):\n%s", diff)
}
Expand Down
Loading