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.

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

CountIn() does not assume the requests has 2 or more pods count #4355

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
12 changes: 9 additions & 3 deletions pkg/cache/tas_flavor_snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,9 @@ func (s *TASFlavorSnapshot) findTopologyAssignment(
return nil, fmt.Sprintf("no requested topology level: %s", *key)
}
// phase 1 - determine the number of pods which can fit in each topology domain
s.fillInCounts(requests, assumedUsage, simulateEmpty, append(podSetTolerations, s.tolerations...))
if err := s.fillInCounts(requests, assumedUsage, simulateEmpty, append(podSetTolerations, s.tolerations...)); err != nil {
return nil, fmt.Sprintf("unexpected pods fitting calculation failure: %v", err)
}

// phase 2a: determine the level at which the assignment is done along with
// the domains which can accommodate all pods
Expand Down Expand Up @@ -508,7 +510,7 @@ func (s *TASFlavorSnapshot) sortedDomains(domains []*domain) []*domain {
func (s *TASFlavorSnapshot) fillInCounts(requests resources.Requests,
assumedUsage map[utiltas.TopologyDomainID]resources.Requests,
simulateEmpty bool,
tolerations []corev1.Toleration) {
tolerations []corev1.Toleration) error {
for _, domain := range s.domains {
// cleanup the state in case some remaining values are present from computing
// assignments for previous PodSets.
Expand All @@ -529,11 +531,15 @@ func (s *TASFlavorSnapshot) fillInCounts(requests resources.Requests,
if leafAssumedUsage, found := assumedUsage[leaf.domain.id]; found {
remainingCapacity.Sub(leafAssumedUsage)
}
leaf.state = requests.CountIn(remainingCapacity)
var err error
if leaf.state, err = requests.CountIn(remainingCapacity); err != nil {
return err
}
}
for _, root := range s.roots {
root.state = s.fillInCountsHelper(root)
}
return nil
}

func (s *TASFlavorSnapshot) fillInCountsHelper(domain *domain) int32 {
Expand Down
16 changes: 12 additions & 4 deletions pkg/resources/requests.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package resources

import (
"errors"
"maps"
"strings"

Expand All @@ -25,6 +26,10 @@ import (
"k8s.io/utils/ptr"
)

var (
errorRequestsHasTwoOrMorePodsCount = errors.New("requests have 2 or more Pods count")
)

// The following resources calculations are inspired on
// https://github.com/kubernetes/kubernetes/blob/master/pkg/scheduler/framework/types.go

Expand Down Expand Up @@ -103,18 +108,21 @@ func ResourceQuantityString(name corev1.ResourceName, v int64) string {
return rq.String()
}

func (req Requests) CountIn(capacity Requests) int32 {
func (r Requests) CountIn(capacity Requests) (int32, error) {
if count, ok := r[corev1.ResourcePods]; ok && count > 1 {
return 0, errorRequestsHasTwoOrMorePodsCount
}
var result *int32
for rName, rValue := range req {
for rName, rValue := range r {
capacity, found := capacity[rName]
if !found {
return 0
return 0, nil
}
// find the minimum count matching all the resource quota.
count := int32(capacity / rValue)
if result == nil || count < *result {
result = ptr.To(count)
}
}
return ptr.Deref(result, 0)
return ptr.Deref(result, 0), nil
}
20 changes: 19 additions & 1 deletion pkg/resources/requests_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ package resources
import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
corev1 "k8s.io/api/core/v1"
)

Expand All @@ -27,6 +29,7 @@ func TestCountIn(t *testing.T) {
requests Requests
capacity Requests
wantResult int32
wantError error
}{
"requests equal capacity": {
requests: Requests{
Expand Down Expand Up @@ -80,10 +83,25 @@ func TestCountIn(t *testing.T) {
},
wantResult: 2,
},
"requests have 2 or more Pods count": {
requests: Requests{
corev1.ResourceCPU: 2,
corev1.ResourcePods: 2,
},
capacity: Requests{
corev1.ResourceCPU: 5,
corev1.ResourcePods: 10,
},
wantResult: 0,
wantError: errorRequestsHasTwoOrMorePodsCount,
},
}
for name, tc := range cases {
t.Run(name, func(t *testing.T) {
gotResult := tc.requests.CountIn(tc.capacity)
gotResult, err := tc.requests.CountIn(tc.capacity)
if diff := cmp.Diff(tc.wantError, err, cmpopts.EquateErrors()); len(diff) != 0 {
t.Errorf("unexpected error (-want,+got\n):%s", diff)
}
if tc.wantResult != gotResult {
t.Errorf("unexpected result, want=%d, got=%d", tc.wantResult, gotResult)
}
Expand Down