mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-11-23 12:29:01 +00:00
dedupe pod resource request calculation
This commit is contained in:
Todd Neal
@@ -24,6 +24,8 @@ import (
|
||||
v1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
|
||||
"k8s.io/kubernetes/pkg/api/v1/resource"
|
||||
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
|
||||
"k8s.io/kubernetes/pkg/scheduler/apis/config"
|
||||
"k8s.io/kubernetes/pkg/scheduler/apis/config/validation"
|
||||
@@ -160,20 +162,10 @@ func NewFit(plArgs runtime.Object, h framework.Handle, fts feature.Features) (fr
|
||||
//
|
||||
// Result: CPU: 3, Memory: 3G
|
||||
func computePodResourceRequest(pod *v1.Pod) *preFilterState {
|
||||
// pod hasn't scheduled yet so we don't need to worry about InPlacePodVerticalScalingEnabled
|
||||
reqs := resource.PodRequests(pod, resource.PodResourcesOptions{})
|
||||
result := &preFilterState{}
|
||||
for _, container := range pod.Spec.Containers {
|
||||
result.Add(container.Resources.Requests)
|
||||
}
|
||||
|
||||
// take max_resource(sum_pod, any_init_container)
|
||||
for _, container := range pod.Spec.InitContainers {
|
||||
result.SetMaxResource(container.Resources.Requests)
|
||||
}
|
||||
|
||||
// If Overhead is being utilized, add to the total requests for the pod
|
||||
if pod.Spec.Overhead != nil {
|
||||
result.Add(pod.Spec.Overhead)
|
||||
}
|
||||
result.SetMaxResource(reqs)
|
||||
return result
|
||||
}
|
||||
|
||||
|
||||
@@ -18,7 +18,12 @@ package noderesources
|
||||
|
||||
import (
|
||||
v1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
utilfeature "k8s.io/apiserver/pkg/util/feature"
|
||||
"k8s.io/klog/v2"
|
||||
|
||||
resourcehelper "k8s.io/kubernetes/pkg/api/v1/resource"
|
||||
"k8s.io/kubernetes/pkg/features"
|
||||
"k8s.io/kubernetes/pkg/scheduler/apis/config"
|
||||
"k8s.io/kubernetes/pkg/scheduler/framework"
|
||||
schedutil "k8s.io/kubernetes/pkg/scheduler/util"
|
||||
@@ -108,29 +113,23 @@ func (r *resourceAllocationScorer) calculateResourceAllocatableRequest(nodeInfo
|
||||
|
||||
// calculatePodResourceRequest returns the total non-zero requests. If Overhead is defined for the pod
|
||||
// the Overhead is added to the result.
|
||||
// podResourceRequest = max(sum(podSpec.Containers), podSpec.InitContainers) + overHead
|
||||
func (r *resourceAllocationScorer) calculatePodResourceRequest(pod *v1.Pod, resource v1.ResourceName) int64 {
|
||||
var podRequest int64
|
||||
for i := range pod.Spec.Containers {
|
||||
container := &pod.Spec.Containers[i]
|
||||
value := schedutil.GetRequestForResource(resource, &container.Resources.Requests, !r.useRequested)
|
||||
podRequest += value
|
||||
}
|
||||
func (r *resourceAllocationScorer) calculatePodResourceRequest(pod *v1.Pod, resourceName v1.ResourceName) int64 {
|
||||
|
||||
for i := range pod.Spec.InitContainers {
|
||||
initContainer := &pod.Spec.InitContainers[i]
|
||||
value := schedutil.GetRequestForResource(resource, &initContainer.Resources.Requests, !r.useRequested)
|
||||
if podRequest < value {
|
||||
podRequest = value
|
||||
opts := resourcehelper.PodResourcesOptions{
|
||||
InPlacePodVerticalScalingEnabled: utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling),
|
||||
}
|
||||
if !r.useRequested {
|
||||
opts.NonMissingContainerRequests = v1.ResourceList{
|
||||
v1.ResourceCPU: *resource.NewMilliQuantity(schedutil.DefaultMilliCPURequest, resource.DecimalSI),
|
||||
v1.ResourceMemory: *resource.NewQuantity(schedutil.DefaultMemoryRequest, resource.DecimalSI),
|
||||
}
|
||||
}
|
||||
|
||||
// If Overhead is being utilized, add to the total requests for the pod
|
||||
if pod.Spec.Overhead != nil {
|
||||
if quantity, found := pod.Spec.Overhead[resource]; found {
|
||||
podRequest += quantity.Value()
|
||||
}
|
||||
}
|
||||
requests := resourcehelper.PodRequests(pod, opts)
|
||||
|
||||
return podRequest
|
||||
quantity := requests[resourceName]
|
||||
if resourceName == v1.ResourceCPU {
|
||||
return quantity.MilliValue()
|
||||
}
|
||||
return quantity.Value()
|
||||
}
|
||||
|
||||
@@ -0,0 +1,240 @@
|
||||
/*
|
||||
Copyright 2023 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package noderesources
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
v1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
|
||||
"k8s.io/kubernetes/pkg/scheduler/util"
|
||||
)
|
||||
|
||||
func TestResourceAllocationScorerCalculateRequests(t *testing.T) {
|
||||
const oneMi = 1048576
|
||||
tests := []struct {
|
||||
name string
|
||||
pod v1.Pod
|
||||
expected map[v1.ResourceName]int64
|
||||
}{
|
||||
{
|
||||
name: "overhead only",
|
||||
pod: v1.Pod{
|
||||
Spec: v1.PodSpec{
|
||||
Overhead: v1.ResourceList{
|
||||
v1.ResourceCPU: resource.MustParse("1"),
|
||||
v1.ResourceMemory: resource.MustParse("1Mi"),
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: map[v1.ResourceName]int64{
|
||||
v1.ResourceCPU: 1000,
|
||||
v1.ResourceMemory: oneMi,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "1x requestless container",
|
||||
pod: v1.Pod{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
{},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: map[v1.ResourceName]int64{
|
||||
v1.ResourceCPU: util.DefaultMilliCPURequest,
|
||||
v1.ResourceMemory: util.DefaultMemoryRequest,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "2x requestless container",
|
||||
pod: v1.Pod{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
{}, {},
|
||||
},
|
||||
},
|
||||
},
|
||||
// should accumulate once per container without a request
|
||||
expected: map[v1.ResourceName]int64{
|
||||
v1.ResourceCPU: 2 * util.DefaultMilliCPURequest,
|
||||
v1.ResourceMemory: 2 * util.DefaultMemoryRequest,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "request container + requestless container",
|
||||
pod: v1.Pod{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Resources: v1.ResourceRequirements{
|
||||
Requests: v1.ResourceList{
|
||||
v1.ResourceCPU: resource.MustParse("1"),
|
||||
v1.ResourceMemory: resource.MustParse("1Mi"),
|
||||
},
|
||||
},
|
||||
},
|
||||
{},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: map[v1.ResourceName]int64{
|
||||
v1.ResourceCPU: 1000 + util.DefaultMilliCPURequest,
|
||||
v1.ResourceMemory: oneMi + util.DefaultMemoryRequest,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "container + requestless container + overhead",
|
||||
pod: v1.Pod{
|
||||
Spec: v1.PodSpec{
|
||||
Overhead: v1.ResourceList{
|
||||
v1.ResourceCPU: resource.MustParse("1"),
|
||||
v1.ResourceMemory: resource.MustParse("1Mi"),
|
||||
},
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Resources: v1.ResourceRequirements{
|
||||
Requests: v1.ResourceList{
|
||||
v1.ResourceCPU: resource.MustParse("1"),
|
||||
v1.ResourceMemory: resource.MustParse("1Mi"),
|
||||
},
|
||||
},
|
||||
},
|
||||
{},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: map[v1.ResourceName]int64{
|
||||
v1.ResourceCPU: 2000 + util.DefaultMilliCPURequest,
|
||||
v1.ResourceMemory: 2*oneMi + util.DefaultMemoryRequest,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "init container + container + requestless container + overhead",
|
||||
pod: v1.Pod{
|
||||
Spec: v1.PodSpec{
|
||||
Overhead: v1.ResourceList{
|
||||
v1.ResourceCPU: resource.MustParse("1"),
|
||||
v1.ResourceMemory: resource.MustParse("1Mi"),
|
||||
},
|
||||
InitContainers: []v1.Container{
|
||||
{
|
||||
Resources: v1.ResourceRequirements{
|
||||
Requests: v1.ResourceList{
|
||||
v1.ResourceCPU: resource.MustParse("3"),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Resources: v1.ResourceRequirements{
|
||||
Requests: v1.ResourceList{
|
||||
v1.ResourceCPU: resource.MustParse("1"),
|
||||
v1.ResourceMemory: resource.MustParse("1Mi"),
|
||||
},
|
||||
},
|
||||
},
|
||||
{},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: map[v1.ResourceName]int64{
|
||||
v1.ResourceCPU: 4000,
|
||||
v1.ResourceMemory: 2*oneMi + util.DefaultMemoryRequest,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "requestless init container + small init container + small container ",
|
||||
pod: v1.Pod{
|
||||
Spec: v1.PodSpec{
|
||||
InitContainers: []v1.Container{
|
||||
{},
|
||||
{
|
||||
Resources: v1.ResourceRequirements{
|
||||
Requests: v1.ResourceList{
|
||||
v1.ResourceCPU: resource.MustParse("1m"),
|
||||
v1.ResourceMemory: resource.MustParse("1"),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Resources: v1.ResourceRequirements{
|
||||
Requests: v1.ResourceList{
|
||||
v1.ResourceCPU: resource.MustParse("3m"),
|
||||
v1.ResourceMemory: resource.MustParse("3"),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: map[v1.ResourceName]int64{
|
||||
v1.ResourceCPU: util.DefaultMilliCPURequest,
|
||||
v1.ResourceMemory: util.DefaultMemoryRequest,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "requestless init container + small init container + small container + requestless container ",
|
||||
pod: v1.Pod{
|
||||
Spec: v1.PodSpec{
|
||||
InitContainers: []v1.Container{
|
||||
{},
|
||||
{
|
||||
Resources: v1.ResourceRequirements{
|
||||
Requests: v1.ResourceList{
|
||||
v1.ResourceCPU: resource.MustParse("1m"),
|
||||
v1.ResourceMemory: resource.MustParse("1"),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Resources: v1.ResourceRequirements{
|
||||
Requests: v1.ResourceList{
|
||||
v1.ResourceCPU: resource.MustParse("3m"),
|
||||
v1.ResourceMemory: resource.MustParse("3"),
|
||||
},
|
||||
},
|
||||
},
|
||||
{},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: map[v1.ResourceName]int64{
|
||||
v1.ResourceCPU: 3 + util.DefaultMilliCPURequest,
|
||||
v1.ResourceMemory: 3 + util.DefaultMemoryRequest,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
var scorer resourceAllocationScorer
|
||||
for n, exp := range tc.expected {
|
||||
got := scorer.calculatePodResourceRequest(&tc.pod, n)
|
||||
if got != exp {
|
||||
t.Errorf("expected %s = %d, got %d", n, exp, got)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user