github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106002 from kerthcet/feature/refactor-NodeResourcesFit-plugin

Browse Source 
refactor scheudler's node resource plugins
This commit is contained in:
Kubernetes Prow Robot 2021-11-02 10:52:34 -07:00 committed by GitHub
commit ec8e6e8778
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 1072 additions and 1466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/scheduler/apis/config/register.go
View File

@ -42,10 +42,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&InterPodAffinityArgs{}, &InterPodAffinityArgs{},
&NodeResourcesFitArgs{}, &NodeResourcesFitArgs{},
&PodTopologySpreadArgs{}, &PodTopologySpreadArgs{},
&RequestedToCapacityRatioArgs{},
&VolumeBindingArgs{}, &VolumeBindingArgs{},
&NodeResourcesLeastAllocatedArgs{},
&NodeResourcesMostAllocatedArgs{},
&NodeResourcesBalancedAllocationArgs{}, &NodeResourcesBalancedAllocationArgs{},
&NodeAffinityArgs{}, &NodeAffinityArgs{},
) )

38
pkg/scheduler/apis/config/types_pluginargs.go
View File

@ -113,44 +113,6 @@ type PodTopologySpreadArgs struct {
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// RequestedToCapacityRatioArgs holds arguments used to configure RequestedToCapacityRatio plugin.
type RequestedToCapacityRatioArgs struct {
metav1.TypeMeta
// Points defining priority function shape
Shape []UtilizationShapePoint
// Resources to be considered when scoring.
// The default resource set includes "cpu" and "memory" with an equal weight.
// Weights should be larger than 0.
Resources []ResourceSpec
}
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// NodeResourcesLeastAllocatedArgs holds arguments used to configure NodeResourcesLeastAllocated plugin.
type NodeResourcesLeastAllocatedArgs struct {
metav1.TypeMeta
// Resources to be considered when scoring.
// The default resource set includes "cpu" and "memory" with an equal weight.
// Allowed weights go from 1 to 100.
Resources []ResourceSpec
}
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// NodeResourcesMostAllocatedArgs holds arguments used to configure NodeResourcesMostAllocated plugin.
type NodeResourcesMostAllocatedArgs struct {
metav1.TypeMeta
// Resources to be considered when scoring.
// The default resource set includes "cpu" and "memory" with an equal weight.
// Allowed weights go from 1 to 100.
Resources []ResourceSpec
}
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// NodeResourcesBalancedAllocationArgs holds arguments used to configure NodeResourcesBalancedAllocation plugin. // NodeResourcesBalancedAllocationArgs holds arguments used to configure NodeResourcesBalancedAllocation plugin.
type NodeResourcesBalancedAllocationArgs struct { type NodeResourcesBalancedAllocationArgs struct {
metav1.TypeMeta metav1.TypeMeta

9
pkg/scheduler/apis/config/validation/validation.go
View File

@ -128,11 +128,7 @@ type removedPlugins struct {
var removedPluginsByVersion = []removedPlugins{ var removedPluginsByVersion = []removedPlugins{
{ {
schemeGroupVersion: v1beta2.SchemeGroupVersion.String(), schemeGroupVersion: v1beta2.SchemeGroupVersion.String(),
plugins: []string{ plugins: []string{},
"NodeResourcesLeastAllocated",
"NodeResourcesMostAllocated",
"RequestedToCapacityRatio",
},
}, },
{ {
schemeGroupVersion: v1beta3.SchemeGroupVersion.String(), schemeGroupVersion: v1beta3.SchemeGroupVersion.String(),
@ -183,10 +179,7 @@ func validatePluginConfig(path *field.Path, apiVersion string, profile *config.K
"NodeAffinity": ValidateNodeAffinityArgs, "NodeAffinity": ValidateNodeAffinityArgs,
"NodeResourcesBalancedAllocation": ValidateNodeResourcesBalancedAllocationArgs, "NodeResourcesBalancedAllocation": ValidateNodeResourcesBalancedAllocationArgs,
"NodeResourcesFitArgs": ValidateNodeResourcesFitArgs, "NodeResourcesFitArgs": ValidateNodeResourcesFitArgs,
"NodeResourcesLeastAllocated": ValidateNodeResourcesLeastAllocatedArgs,
"NodeResourcesMostAllocated": ValidateNodeResourcesMostAllocatedArgs,
"PodTopologySpread": ValidatePodTopologySpreadArgs, "PodTopologySpread": ValidatePodTopologySpreadArgs,
"RequestedToCapacityRatio": ValidateRequestedToCapacityRatioArgs,
"VolumeBinding": ValidateVolumeBindingArgs, "VolumeBinding": ValidateVolumeBindingArgs,
} }

30
pkg/scheduler/apis/config/validation/validation_pluginargs.go
View File

@ -164,14 +164,6 @@ func validateConstraintNotRepeat(path *field.Path, constraints []v1.TopologySpre
return nil return nil
} }
// ValidateRequestedToCapacityRatioArgs validates that RequestedToCapacityRatioArgs are correct.
func ValidateRequestedToCapacityRatioArgs(path *field.Path, args *config.RequestedToCapacityRatioArgs) error {
var allErrs field.ErrorList
allErrs = append(allErrs, validateFunctionShape(args.Shape, path.Child("shape"))...)
allErrs = append(allErrs, validateResourcesNoMax(args.Resources, path.Child("resources"))...)
return allErrs.ToAggregate()
}
func validateFunctionShape(shape []config.UtilizationShapePoint, path *field.Path) field.ErrorList { func validateFunctionShape(shape []config.UtilizationShapePoint, path *field.Path) field.ErrorList {
const ( const (
minUtilization = 0 minUtilization = 0
@ -209,28 +201,6 @@ func validateFunctionShape(shape []config.UtilizationShapePoint, path *field.Pat
return allErrs return allErrs
} }
// weight of resource is allowed to exceed 100, this is only applicable to `RequestedToCapacityRatio` plugin for backwards compatibility reason.
func validateResourcesNoMax(resources []config.ResourceSpec, p *field.Path) field.ErrorList {
var allErrs field.ErrorList
for i, r := range resources {
if r.Weight < 1 {
allErrs = append(allErrs, field.Invalid(p.Index(i).Child("weight"), r.Weight,
fmt.Sprintf("resource weight of %s not in valid range [1, inf)", r.Name)))
}
}
return allErrs
}
// ValidateNodeResourcesLeastAllocatedArgs validates that NodeResourcesLeastAllocatedArgs are correct.
func ValidateNodeResourcesLeastAllocatedArgs(path *field.Path, args *config.NodeResourcesLeastAllocatedArgs) error {
return validateResources(args.Resources, path.Child("resources")).ToAggregate()
}
// ValidateNodeResourcesMostAllocatedArgs validates that NodeResourcesMostAllocatedArgs are correct.
func ValidateNodeResourcesMostAllocatedArgs(path *field.Path, args *config.NodeResourcesMostAllocatedArgs) error {
return validateResources(args.Resources, path.Child("resources")).ToAggregate()
}
func validateResources(resources []config.ResourceSpec, p *field.Path) field.ErrorList { func validateResources(resources []config.ResourceSpec, p *field.Path) field.ErrorList {
var allErrs field.ErrorList var allErrs field.ErrorList
for i, resource := range resources { for i, resource := range resources {

794
pkg/scheduler/apis/config/validation/validation_pluginargs_test.go
View File

@ -358,422 +358,6 @@ func TestValidatePodTopologySpreadArgs(t *testing.T) {
} }
} }
func TestValidateRequestedToCapacityRatioArgs(t *testing.T) {
cases := map[string]struct {
args config.RequestedToCapacityRatioArgs
wantErrs field.ErrorList
}{
"valid config": {
args: config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{
{
Utilization: 20,
Score: 5,
},
{
Utilization: 30,
Score: 3,
},
{
Utilization: 50,
Score: 2,
},
},
Resources: []config.ResourceSpec{
{
Name: "custom-resource",
Weight: 5,
},
},
},
},
"no shape points": {
args: config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{},
Resources: []config.ResourceSpec{
{
Name: "custom",
Weight: 5,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeRequired,
Field: "shape",
},
},
},
"utilization less than min": {
args: config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{
{
Utilization: -10,
Score: 3,
},
{
Utilization: 10,
Score: 2,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "shape[0].utilization",
},
},
},
"utilization greater than max": {
args: config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{
{
Utilization: 10,
Score: 3,
},
{
Utilization: 110,
Score: 2,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "shape[1].utilization",
},
},
},
"utilization values in non-increasing order": {
args: config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{
{
Utilization: 30,
Score: 3,
},
{
Utilization: 20,
Score: 2,
},
{
Utilization: 10,
Score: 1,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "shape[1].utilization",
},
},
},
"duplicated utilization values": {
args: config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{
{
Utilization: 10,
Score: 3,
},
{
Utilization: 20,
Score: 2,
},
{
Utilization: 20,
Score: 1,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "shape[2].utilization",
},
},
},
"score less than min": {
args: config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{
{
Utilization: 10,
Score: -1,
},
{
Utilization: 20,
Score: 2,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "shape[0].score",
},
},
},
"score greater than max": {
args: config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{
{
Utilization: 10,
Score: 3,
},
{
Utilization: 20,
Score: 11,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "shape[1].score",
},
},
},
"resources weight less than 1": {
args: config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{
{
Utilization: 10,
Score: 1,
},
},
Resources: []config.ResourceSpec{
{
Name: "custom",
Weight: 0,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
"multiple errors": {
args: config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{
{
Utilization: 20,
Score: -1,
},
{
Utilization: 10,
Score: 2,
},
},
Resources: []config.ResourceSpec{
{
Name: "custom",
Weight: 0,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "shape[1].utilization",
},
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "shape[0].score",
},
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
}
for name, tc := range cases {
t.Run(name, func(t *testing.T) {
err := ValidateRequestedToCapacityRatioArgs(nil, &tc.args)
if diff := cmp.Diff(tc.wantErrs.ToAggregate(), err, ignoreBadValueDetail); diff != "" {
t.Errorf("ValidateRequestedToCapacityRatioArgs returned err (-want,+got):\n%s", diff)
}
})
}
}
func TestValidateNodeResourcesLeastAllocatedArgs(t *testing.T) {
cases := map[string]struct {
args *config.NodeResourcesLeastAllocatedArgs
wantErrs field.ErrorList
}{
"valid config": {
args: &config.NodeResourcesLeastAllocatedArgs{
Resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 50,
},
{
Name: "memory",
Weight: 30,
},
},
},
},
"weight less than min": {
args: &config.NodeResourcesLeastAllocatedArgs{
Resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 0,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
"weight more than max": {
args: &config.NodeResourcesLeastAllocatedArgs{
Resources: []config.ResourceSpec{
{
Name: "memory",
Weight: 101,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
"multiple error": {
args: &config.NodeResourcesLeastAllocatedArgs{
Resources: []config.ResourceSpec{
{
Name: "memory",
Weight: 0,
},
{
Name: "cpu",
Weight: 101,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "resources[1].weight",
},
},
},
}
for name, tc := range cases {
t.Run(name, func(t *testing.T) {
err := ValidateNodeResourcesLeastAllocatedArgs(nil, tc.args)
if diff := cmp.Diff(tc.wantErrs.ToAggregate(), err, ignoreBadValueDetail); diff != "" {
t.Errorf("ValidateNodeResourcesLeastAllocatedArgs returned err (-want,+got):\n%s", diff)
}
})
}
}
func TestValidateNodeResourcesMostAllocatedArgs(t *testing.T) {
cases := map[string]struct {
args *config.NodeResourcesMostAllocatedArgs
wantErrs field.ErrorList
}{
"valid config": {
args: &config.NodeResourcesMostAllocatedArgs{
Resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 70,
},
{
Name: "memory",
Weight: 40,
},
},
},
},
"weight less than min": {
args: &config.NodeResourcesMostAllocatedArgs{
Resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: -1,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
"weight more than max": {
args: &config.NodeResourcesMostAllocatedArgs{
Resources: []config.ResourceSpec{
{
Name: "memory",
Weight: 110,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
"multiple error": {
args: &config.NodeResourcesMostAllocatedArgs{
Resources: []config.ResourceSpec{
{
Name: "memory",
Weight: -1,
},
{
Name: "cpu",
Weight: 110,
},
},
},
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "resources[1].weight",
},
},
},
}
for name, tc := range cases {
t.Run(name, func(t *testing.T) {
err := ValidateNodeResourcesMostAllocatedArgs(nil, tc.args)
if diff := cmp.Diff(tc.wantErrs.ToAggregate(), err, ignoreBadValueDetail); diff != "" {
t.Errorf("ValidateNodeResourcesLeastAllocatedArgs returned err (-want,+got):\n%s", diff)
}
})
}
}
func TestValidateNodeResourcesBalancedAllocationArgs(t *testing.T) { func TestValidateNodeResourcesBalancedAllocationArgs(t *testing.T) {
cases := map[string]struct { cases := map[string]struct {
args *config.NodeResourcesBalancedAllocationArgs args *config.NodeResourcesBalancedAllocationArgs
@ -1171,3 +755,381 @@ func TestValidateFitArgs(t *testing.T) {
}) })
} }
} }
func TestValidateLeastAllocatedScoringStrategy(t *testing.T) {
tests := []struct {
name string
resources []config.ResourceSpec
wantErrs field.ErrorList
}{
{
name: "default config",
wantErrs: nil,
},
{
name: "multi valid resources",
resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 1,
},
{
Name: "memory",
Weight: 10,
},
},
wantErrs: nil,
},
{
name: "weight less than min",
resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 0,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
{
name: "weight greater than max",
resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 101,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
{
name: "multi invalid resources",
resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 0,
},
{
Name: "memory",
Weight: 101,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
{
Type: field.ErrorTypeInvalid,
Field: "resources[1].weight",
},
},
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
args := config.NodeResourcesFitArgs{
ScoringStrategy: &config.ScoringStrategy{
Type: config.LeastAllocated,
Resources: test.resources,
},
}
err := ValidateNodeResourcesFitArgs(nil, &args)
if diff := cmp.Diff(test.wantErrs.ToAggregate(), err, ignoreBadValueDetail); diff != "" {
t.Errorf("ValidateNodeResourcesFitArgs returned err (-want,+got):\n%s", diff)
}
})
}
}
func TestValidateMostAllocatedScoringStrategy(t *testing.T) {
tests := []struct {
name string
resources []config.ResourceSpec
wantErrs field.ErrorList
}{
{
name: "default config",
wantErrs: nil,
},
{
name: "multi valid resources",
resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 1,
},
{
Name: "memory",
Weight: 10,
},
},
wantErrs: nil,
},
{
name: "weight less than min",
resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 0,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
{
name: "weight greater than max",
resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 101,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
{
name: "multi invalid resources",
resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 0,
},
{
Name: "memory",
Weight: 101,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
{
Type: field.ErrorTypeInvalid,
Field: "resources[1].weight",
},
},
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
args := config.NodeResourcesFitArgs{
ScoringStrategy: &config.ScoringStrategy{
Type: config.MostAllocated,
Resources: test.resources,
},
}
err := ValidateNodeResourcesFitArgs(nil, &args)
if diff := cmp.Diff(test.wantErrs.ToAggregate(), err, ignoreBadValueDetail); diff != "" {
t.Errorf("ValidateNodeResourcesFitArgs returned err (-want,+got):\n%s", diff)
}
})
}
}
func TestValidateRequestedToCapacityRatioScoringStrategy(t *testing.T) {
tests := []struct {
name string
resources []config.ResourceSpec
shapes []config.UtilizationShapePoint
wantErrs field.ErrorList
}{
{
name: "weight greater than max",
resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 101,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
{
name: "weight less than min",
resources: []config.ResourceSpec{
{
Name: "cpu",
Weight: 0,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "resources[0].weight",
},
},
},
{
name: "valid shapes",
shapes: []config.UtilizationShapePoint{
{
Utilization: 30,
Score: 3,
},
},
wantErrs: nil,
},
{
name: "utilization less than min",
shapes: []config.UtilizationShapePoint{
{
Utilization: -1,
Score: 3,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "shape[0].utilization",
},
},
},
{
name: "utilization greater than max",
shapes: []config.UtilizationShapePoint{
{
Utilization: 101,
Score: 3,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "shape[0].utilization",
},
},
},
{
name: "duplicated utilization values",
shapes: []config.UtilizationShapePoint{
{
Utilization: 10,
Score: 3,
},
{
Utilization: 10,
Score: 3,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "shape[1].utilization",
},
},
},
{
name: "increasing utilization values",
shapes: []config.UtilizationShapePoint{
{
Utilization: 10,
Score: 3,
},
{
Utilization: 20,
Score: 3,
},
{
Utilization: 30,
Score: 3,
},
},
wantErrs: nil,
},
{
name: "non-increasing utilization values",
shapes: []config.UtilizationShapePoint{
{
Utilization: 10,
Score: 3,
},
{
Utilization: 20,
Score: 3,
},
{
Utilization: 15,
Score: 3,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "shape[2].utilization",
},
},
},
{
name: "score less than min",
shapes: []config.UtilizationShapePoint{
{
Utilization: 10,
Score: -1,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "shape[0].score",
},
},
},
{
name: "score greater than max",
shapes: []config.UtilizationShapePoint{
{
Utilization: 10,
Score: 11,
},
},
wantErrs: field.ErrorList{
{
Type: field.ErrorTypeInvalid,
Field: "shape[0].score",
},
},
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
args := config.NodeResourcesFitArgs{
ScoringStrategy: &config.ScoringStrategy{
Type: config.RequestedToCapacityRatio,
Resources: test.resources,
RequestedToCapacityRatio: &config.RequestedToCapacityRatioParam{
Shape: test.shapes,
},
},
}
err := ValidateNodeResourcesFitArgs(nil, &args)
if diff := cmp.Diff(test.wantErrs.ToAggregate(), err, ignoreBadValueDetail); diff != "" {
t.Errorf("ValidateNodeResourcesFitArgs returned err (-want,+got):\n%s", diff)
}
})
}
}

57
pkg/scheduler/apis/config/validation/validation_test.go
View File

@ -198,21 +198,9 @@ func TestValidateKubeSchedulerConfigurationV1beta2(t *testing.T) {
BindVerb: "bar", BindVerb: "bar",
}) })
badRemovedPlugins1 := validConfig.DeepCopy()
badRemovedPlugins1.Profiles[0].Plugins.Score.Enabled = append(badRemovedPlugins1.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "NodeResourcesLeastAllocated", Weight: 2})
badRemovedPlugins3 := validConfig.DeepCopy()
badRemovedPlugins3.Profiles[0].Plugins.Score.Enabled = append(badRemovedPlugins3.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "NodeResourcesMostAllocated", Weight: 2})
goodRemovedPlugins2 := validConfig.DeepCopy() goodRemovedPlugins2 := validConfig.DeepCopy()
goodRemovedPlugins2.Profiles[0].Plugins.Score.Enabled = append(goodRemovedPlugins2.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "PodTopologySpread", Weight: 2}) goodRemovedPlugins2.Profiles[0].Plugins.Score.Enabled = append(goodRemovedPlugins2.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "PodTopologySpread", Weight: 2})
deprecatedPluginsConfig := validConfig.DeepCopy()
deprecatedPluginsConfig.Profiles[0].PluginConfig = append(deprecatedPluginsConfig.Profiles[0].PluginConfig, config.PluginConfig{
Name: "NodeResourcesLeastAllocated",
Args: &config.NodeResourcesLeastAllocatedArgs{},
})
scenarios := map[string]struct { scenarios := map[string]struct {
expectedToFail bool expectedToFail bool
config *config.KubeSchedulerConfiguration config *config.KubeSchedulerConfiguration
@ -290,23 +278,10 @@ func TestValidateKubeSchedulerConfigurationV1beta2(t *testing.T) {
expectedToFail: true, expectedToFail: true,
config: mismatchQueueSort, config: mismatchQueueSort,
}, },
"bad-removed-plugins-1": {
expectedToFail: true,
config: badRemovedPlugins1,
},
"bad-removed-plugins-3": {
expectedToFail: true,
config: badRemovedPlugins3,
},
"good-removed-plugins-2": { "good-removed-plugins-2": {
expectedToFail: false, expectedToFail: false,
config: goodRemovedPlugins2, config: goodRemovedPlugins2,
}, },
"bad-plugins-config": {
expectedToFail: true,
config: deprecatedPluginsConfig,
errorString: "profiles[0].pluginConfig[1]: Invalid value: \"NodeResourcesLeastAllocated\": was removed in version \"kubescheduler.config.k8s.io/v1beta2\" (KubeSchedulerConfiguration is version \"kubescheduler.config.k8s.io/v1beta2\")",
},
} }
for name, scenario := range scenarios { for name, scenario := range scenarios {
@ -497,24 +472,9 @@ func TestValidateKubeSchedulerConfigurationV1beta3(t *testing.T) {
BindVerb: "bar", BindVerb: "bar",
}) })
badRemovedPlugins1 := validConfig.DeepCopy()
badRemovedPlugins1.Profiles[0].Plugins.Score.Enabled = append(badRemovedPlugins1.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "NodeResourcesLeastAllocated", Weight: 2})
badRemovedPlugins2 := validConfig.DeepCopy()
badRemovedPlugins2.Profiles[0].Plugins.Score.Enabled = append(badRemovedPlugins2.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "RequestedToCapacityRatio", Weight: 2})
badRemovedPlugins3 := validConfig.DeepCopy()
badRemovedPlugins3.Profiles[0].Plugins.Score.Enabled = append(badRemovedPlugins3.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "NodeResourcesMostAllocated", Weight: 2})
goodRemovedPlugins2 := validConfig.DeepCopy() goodRemovedPlugins2 := validConfig.DeepCopy()
goodRemovedPlugins2.Profiles[0].Plugins.Score.Enabled = append(goodRemovedPlugins2.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "PodTopologySpread", Weight: 2}) goodRemovedPlugins2.Profiles[0].Plugins.Score.Enabled = append(goodRemovedPlugins2.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "PodTopologySpread", Weight: 2})
deprecatedPluginsConfig := validConfig.DeepCopy()
deprecatedPluginsConfig.Profiles[0].PluginConfig = append(deprecatedPluginsConfig.Profiles[0].PluginConfig, config.PluginConfig{
Name: "NodeResourcesLeastAllocated",
Args: &config.NodeResourcesLeastAllocatedArgs{},
})
scenarios := map[string]struct { scenarios := map[string]struct {
expectedToFail bool expectedToFail bool
config *config.KubeSchedulerConfiguration config *config.KubeSchedulerConfiguration
@ -592,27 +552,10 @@ func TestValidateKubeSchedulerConfigurationV1beta3(t *testing.T) {
expectedToFail: true, expectedToFail: true,
config: mismatchQueueSort, config: mismatchQueueSort,
}, },
"bad-removed-plugins-1": {
expectedToFail: true,
config: badRemovedPlugins1,
},
"bad-removed-plugins-2": {
expectedToFail: true,
config: badRemovedPlugins2,
},
"bad-removed-plugins-3": {
expectedToFail: true,
config: badRemovedPlugins3,
},
"good-removed-plugins-2": { "good-removed-plugins-2": {
expectedToFail: false, expectedToFail: false,
config: goodRemovedPlugins2, config: goodRemovedPlugins2,
}, },
"bad-plugins-config": {
expectedToFail: true,
config: deprecatedPluginsConfig,
errorString: "profiles[0].pluginConfig[1]: Invalid value: \"NodeResourcesLeastAllocated\": was removed in version \"kubescheduler.config.k8s.io/v1beta2\" (KubeSchedulerConfiguration is version \"kubescheduler.config.k8s.io/v1beta3\")",
},
} }
for name, scenario := range scenarios { for name, scenario := range scenarios {

95
pkg/scheduler/apis/config/zz_generated.deepcopy.go generated
View File

@ -320,66 +320,6 @@ func (in *NodeResourcesFitArgs) DeepCopyObject() runtime.Object {
return nil return nil
} }
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *NodeResourcesLeastAllocatedArgs) DeepCopyInto(out *NodeResourcesLeastAllocatedArgs) {
*out = *in
out.TypeMeta = in.TypeMeta
if in.Resources != nil {
in, out := &in.Resources, &out.Resources
*out = make([]ResourceSpec, len(*in))
copy(*out, *in)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NodeResourcesLeastAllocatedArgs.
func (in *NodeResourcesLeastAllocatedArgs) DeepCopy() *NodeResourcesLeastAllocatedArgs {
if in == nil {
return nil
}
out := new(NodeResourcesLeastAllocatedArgs)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *NodeResourcesLeastAllocatedArgs) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *NodeResourcesMostAllocatedArgs) DeepCopyInto(out *NodeResourcesMostAllocatedArgs) {
*out = *in
out.TypeMeta = in.TypeMeta
if in.Resources != nil {
in, out := &in.Resources, &out.Resources
*out = make([]ResourceSpec, len(*in))
copy(*out, *in)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NodeResourcesMostAllocatedArgs.
func (in *NodeResourcesMostAllocatedArgs) DeepCopy() *NodeResourcesMostAllocatedArgs {
if in == nil {
return nil
}
out := new(NodeResourcesMostAllocatedArgs)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *NodeResourcesMostAllocatedArgs) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *Plugin) DeepCopyInto(out *Plugin) { func (in *Plugin) DeepCopyInto(out *Plugin) {
*out = *in *out = *in
@ -500,41 +440,6 @@ func (in *PodTopologySpreadArgs) DeepCopyObject() runtime.Object {
return nil return nil
} }
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *RequestedToCapacityRatioArgs) DeepCopyInto(out *RequestedToCapacityRatioArgs) {
*out = *in
out.TypeMeta = in.TypeMeta
if in.Shape != nil {
in, out := &in.Shape, &out.Shape
*out = make([]UtilizationShapePoint, len(*in))
copy(*out, *in)
}
if in.Resources != nil {
in, out := &in.Resources, &out.Resources
*out = make([]ResourceSpec, len(*in))
copy(*out, *in)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RequestedToCapacityRatioArgs.
func (in *RequestedToCapacityRatioArgs) DeepCopy() *RequestedToCapacityRatioArgs {
if in == nil {
return nil
}
out := new(RequestedToCapacityRatioArgs)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *RequestedToCapacityRatioArgs) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *RequestedToCapacityRatioParam) DeepCopyInto(out *RequestedToCapacityRatioParam) { func (in *RequestedToCapacityRatioParam) DeepCopyInto(out *RequestedToCapacityRatioParam) {
*out = *in *out = *in

3
pkg/scheduler/framework/plugins/names/names.go
View File

@ -27,9 +27,6 @@ const (
NodePorts = "NodePorts" NodePorts = "NodePorts"
NodeResourcesBalancedAllocation = "NodeResourcesBalancedAllocation" NodeResourcesBalancedAllocation = "NodeResourcesBalancedAllocation"
NodeResourcesFit = "NodeResourcesFit" NodeResourcesFit = "NodeResourcesFit"
NodeResourcesLeastAllocated = "NodeResourcesLeastAllocated"
NodeResourcesMostAllocated = "NodeResourcesMostAllocated"
RequestedToCapacityRatio = "RequestedToCapacityRatio"
NodeUnschedulable = "NodeUnschedulable" NodeUnschedulable = "NodeUnschedulable"
NodeVolumeLimits = "NodeVolumeLimits" NodeVolumeLimits = "NodeVolumeLimits"
AzureDiskLimits = "AzureDiskLimits" AzureDiskLimits = "AzureDiskLimits"

14
pkg/scheduler/framework/plugins/noderesources/fit.go
View File

@ -51,7 +51,7 @@ var nodeResourceStrategyTypeMap = map[config.ScoringStrategyType]scorer{
config.LeastAllocated: func(args *config.NodeResourcesFitArgs) *resourceAllocationScorer { config.LeastAllocated: func(args *config.NodeResourcesFitArgs) *resourceAllocationScorer {
resToWeightMap := resourcesToWeightMap(args.ScoringStrategy.Resources) resToWeightMap := resourcesToWeightMap(args.ScoringStrategy.Resources)
return &resourceAllocationScorer{ return &resourceAllocationScorer{
Name: LeastAllocatedName, Name: string(config.LeastAllocated),
scorer: leastResourceScorer(resToWeightMap), scorer: leastResourceScorer(resToWeightMap),
resourceToWeightMap: resToWeightMap, resourceToWeightMap: resToWeightMap,
} }
@ -59,7 +59,7 @@ var nodeResourceStrategyTypeMap = map[config.ScoringStrategyType]scorer{
config.MostAllocated: func(args *config.NodeResourcesFitArgs) *resourceAllocationScorer { config.MostAllocated: func(args *config.NodeResourcesFitArgs) *resourceAllocationScorer {
resToWeightMap := resourcesToWeightMap(args.ScoringStrategy.Resources) resToWeightMap := resourcesToWeightMap(args.ScoringStrategy.Resources)
return &resourceAllocationScorer{ return &resourceAllocationScorer{
Name: MostAllocatedName, Name: string(config.MostAllocated),
scorer: mostResourceScorer(resToWeightMap), scorer: mostResourceScorer(resToWeightMap),
resourceToWeightMap: resToWeightMap, resourceToWeightMap: resToWeightMap,
} }
@ -67,7 +67,7 @@ var nodeResourceStrategyTypeMap = map[config.ScoringStrategyType]scorer{
config.RequestedToCapacityRatio: func(args *config.NodeResourcesFitArgs) *resourceAllocationScorer { config.RequestedToCapacityRatio: func(args *config.NodeResourcesFitArgs) *resourceAllocationScorer {
resToWeightMap := resourcesToWeightMap(args.ScoringStrategy.Resources) resToWeightMap := resourcesToWeightMap(args.ScoringStrategy.Resources)
return &resourceAllocationScorer{ return &resourceAllocationScorer{
Name: RequestedToCapacityRatioName, Name: string(config.RequestedToCapacityRatio),
scorer: requestedToCapacityRatioScorer(resToWeightMap, args.ScoringStrategy.RequestedToCapacityRatio.Shape), scorer: requestedToCapacityRatioScorer(resToWeightMap, args.ScoringStrategy.RequestedToCapacityRatio.Shape),
resourceToWeightMap: resToWeightMap, resourceToWeightMap: resToWeightMap,
} }
@ -118,8 +118,8 @@ func NewFit(plArgs runtime.Object, h framework.Handle, fts feature.Features) (fr
} }
strategy := args.ScoringStrategy.Type strategy := args.ScoringStrategy.Type
scorePlugin, ok := nodeResourceStrategyTypeMap[strategy] scorePlugin, exists := nodeResourceStrategyTypeMap[strategy]
if !ok { if !exists {
return nil, fmt.Errorf("scoring strategy %s is not supported", strategy) return nil, fmt.Errorf("scoring strategy %s is not supported", strategy)
} }
@ -229,8 +229,8 @@ func (f *Fit) Filter(ctx context.Context, cycleState *framework.CycleState, pod
if len(insufficientResources) != 0 { if len(insufficientResources) != 0 {
// We will keep all failure reasons. // We will keep all failure reasons.
failureReasons := make([]string, 0, len(insufficientResources)) failureReasons := make([]string, 0, len(insufficientResources))
for _, r := range insufficientResources { for i := range insufficientResources {
failureReasons = append(failureReasons, r.Reason) failureReasons = append(failureReasons, insufficientResources[i].Reason)
} }
return framework.NewStatus(framework.Unschedulable, failureReasons...) return framework.NewStatus(framework.Unschedulable, failureReasons...)
} }

108
pkg/scheduler/framework/plugins/noderesources/fit_test.go
View File

@ -32,6 +32,7 @@ import (
plfeature "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" plfeature "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
"k8s.io/kubernetes/pkg/scheduler/framework/runtime" "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
"k8s.io/kubernetes/pkg/scheduler/internal/cache" "k8s.io/kubernetes/pkg/scheduler/internal/cache"
st "k8s.io/kubernetes/pkg/scheduler/testing"
) )
var ( var (
@ -598,29 +599,37 @@ func TestStorageRequests(t *testing.T) {
} }
func TestFitScore(t *testing.T) { func TestFitScore(t *testing.T) {
type test struct { defaultResources := []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1},
}
tests := []struct {
name string name string
requestedPod *v1.Pod requestedPod *v1.Pod
nodes []*v1.Node nodes []*v1.Node
scheduledPods []*v1.Pod existingPods []*v1.Pod
expectedPriorities framework.NodeScoreList expectedPriorities framework.NodeScoreList
nodeResourcesFitArgs config.NodeResourcesFitArgs nodeResourcesFitArgs config.NodeResourcesFitArgs
} }{
tests := []test{
{ {
name: "test case for ScoringStrategy RequestedToCapacityRatio case1", name: "test case for ScoringStrategy RequestedToCapacityRatio case1",
requestedPod: makePod("", 3000, 5000), requestedPod: st.MakePod().
nodes: []*v1.Node{makeNode("node1", 4000, 10000), makeNode("node2", 6000, 10000)}, Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).
scheduledPods: []*v1.Pod{makePod("node1", 2000, 4000), makePod("node2", 1000, 2000)}, Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "4000"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).Obj(),
},
expectedPriorities: []framework.NodeScore{{Name: "node1", Score: 10}, {Name: "node2", Score: 32}}, expectedPriorities: []framework.NodeScore{{Name: "node1", Score: 10}, {Name: "node2", Score: 32}},
nodeResourcesFitArgs: config.NodeResourcesFitArgs{ nodeResourcesFitArgs: config.NodeResourcesFitArgs{
ScoringStrategy: &config.ScoringStrategy{ ScoringStrategy: &config.ScoringStrategy{
Type: config.RequestedToCapacityRatio, Type: config.RequestedToCapacityRatio,
Resources: []config.ResourceSpec{ Resources: defaultResources,
{Name: "memory", Weight: 1},
{Name: "cpu", Weight: 1},
},
RequestedToCapacityRatio: &config.RequestedToCapacityRatioParam{ RequestedToCapacityRatio: &config.RequestedToCapacityRatioParam{
Shape: []config.UtilizationShapePoint{ Shape: []config.UtilizationShapePoint{
{Utilization: 0, Score: 10}, {Utilization: 0, Score: 10},
@ -631,18 +640,23 @@ func TestFitScore(t *testing.T) {
}, },
}, },
{ {
name: "test case for ScoringStrategy RequestedToCapacityRatio case2", name: "test case for ScoringStrategy RequestedToCapacityRatio case2",
requestedPod: makePod("", 3000, 5000), requestedPod: st.MakePod().
nodes: []*v1.Node{makeNode("node1", 4000, 10000), makeNode("node2", 6000, 10000)}, Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).
scheduledPods: []*v1.Pod{makePod("node1", 2000, 4000), makePod("node2", 1000, 2000)}, Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "4000"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).Obj(),
},
expectedPriorities: []framework.NodeScore{{Name: "node1", Score: 95}, {Name: "node2", Score: 68}}, expectedPriorities: []framework.NodeScore{{Name: "node1", Score: 95}, {Name: "node2", Score: 68}},
nodeResourcesFitArgs: config.NodeResourcesFitArgs{ nodeResourcesFitArgs: config.NodeResourcesFitArgs{
ScoringStrategy: &config.ScoringStrategy{ ScoringStrategy: &config.ScoringStrategy{
Type: config.RequestedToCapacityRatio, Type: config.RequestedToCapacityRatio,
Resources: []config.ResourceSpec{ Resources: defaultResources,
{Name: "memory", Weight: 1},
{Name: "cpu", Weight: 1},
},
RequestedToCapacityRatio: &config.RequestedToCapacityRatioParam{ RequestedToCapacityRatio: &config.RequestedToCapacityRatioParam{
Shape: []config.UtilizationShapePoint{ Shape: []config.UtilizationShapePoint{
{Utilization: 0, Score: 0}, {Utilization: 0, Score: 0},
@ -653,34 +667,44 @@ func TestFitScore(t *testing.T) {
}, },
}, },
{ {
name: "test case for ScoringStrategy MostAllocated", name: "test case for ScoringStrategy MostAllocated",
requestedPod: makePod("", 1000, 2000), requestedPod: st.MakePod().
nodes: []*v1.Node{makeNode("node1", 4000, 10000), makeNode("node2", 6000, 10000)}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
scheduledPods: []*v1.Pod{makePod("node1", 2000, 4000), makePod("node2", 1000, 2000)}, Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "4000"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).Obj(),
},
expectedPriorities: []framework.NodeScore{{Name: "node1", Score: 67}, {Name: "node2", Score: 36}}, expectedPriorities: []framework.NodeScore{{Name: "node1", Score: 67}, {Name: "node2", Score: 36}},
nodeResourcesFitArgs: config.NodeResourcesFitArgs{ nodeResourcesFitArgs: config.NodeResourcesFitArgs{
ScoringStrategy: &config.ScoringStrategy{ ScoringStrategy: &config.ScoringStrategy{
Type: config.MostAllocated, Type: config.MostAllocated,
Resources: []config.ResourceSpec{ Resources: defaultResources,
{Name: "memory", Weight: 1},
{Name: "cpu", Weight: 1},
},
}, },
}, },
}, },
{ {
name: "test case for ScoringStrategy LeastAllocated", name: "test case for ScoringStrategy LeastAllocated",
requestedPod: makePod("", 1000, 2000), requestedPod: st.MakePod().
nodes: []*v1.Node{makeNode("node1", 4000, 10000), makeNode("node2", 6000, 10000)}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
scheduledPods: []*v1.Pod{makePod("node1", 2000, 4000), makePod("node2", 1000, 2000)}, Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "4000"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).Obj(),
},
expectedPriorities: []framework.NodeScore{{Name: "node1", Score: 32}, {Name: "node2", Score: 63}}, expectedPriorities: []framework.NodeScore{{Name: "node1", Score: 32}, {Name: "node2", Score: 63}},
nodeResourcesFitArgs: config.NodeResourcesFitArgs{ nodeResourcesFitArgs: config.NodeResourcesFitArgs{
ScoringStrategy: &config.ScoringStrategy{ ScoringStrategy: &config.ScoringStrategy{
Type: config.LeastAllocated, Type: config.LeastAllocated,
Resources: []config.ResourceSpec{ Resources: defaultResources,
{Name: "memory", Weight: 1},
{Name: "cpu", Weight: 1},
},
}, },
}, },
}, },
@ -689,7 +713,7 @@ func TestFitScore(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
state := framework.NewCycleState() state := framework.NewCycleState()
snapshot := cache.NewSnapshot(test.scheduledPods, test.nodes) snapshot := cache.NewSnapshot(test.existingPods, test.nodes)
fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot)) fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot))
args := test.nodeResourcesFitArgs args := test.nodeResourcesFitArgs
p, err := NewFit(&args, fh, plfeature.Features{EnablePodOverhead: true}) p, err := NewFit(&args, fh, plfeature.Features{EnablePodOverhead: true})

78
pkg/scheduler/framework/plugins/noderesources/least_allocated.go
View File

@ -17,81 +17,15 @@ limitations under the License.
package noderesources package noderesources
import ( import (
"context"
"fmt"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/apis/config/validation"
"k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/names"
) )
// LeastAllocated is a score plugin that favors nodes with fewer allocation requested resources based on requested resources. // leastResourceScorer favors nodes with fewer requested resources.
type LeastAllocated struct { // It calculates the percentage of memory and CPU requested by pods scheduled on the node, and
handle framework.Handle // prioritizes based on the minimum of the average of the fraction of requested to capacity.
resourceAllocationScorer //
} // Details:
// (cpu((capacity-sum(requested))*MaxNodeScore/capacity) + memory((capacity-sum(requested))*MaxNodeScore/capacity))/weightSum
var _ = framework.ScorePlugin(&LeastAllocated{})
// LeastAllocatedName is the name of the plugin used in the plugin registry and configurations.
const LeastAllocatedName = names.NodeResourcesLeastAllocated
// Name returns name of the plugin. It is used in logs, etc.
func (la *LeastAllocated) Name() string {
return LeastAllocatedName
}
// Score invoked at the score extension point.
func (la *LeastAllocated) Score(ctx context.Context, state *framework.CycleState, pod *v1.Pod, nodeName string) (int64, *framework.Status) {
nodeInfo, err := la.handle.SnapshotSharedLister().NodeInfos().Get(nodeName)
if err != nil {
return 0, framework.AsStatus(fmt.Errorf("getting node %q from Snapshot: %w", nodeName, err))
}
// la.score favors nodes with fewer requested resources.
// It calculates the percentage of memory and CPU requested by pods scheduled on the node, and
// prioritizes based on the minimum of the average of the fraction of requested to capacity.
//
// Details:
// (cpu((capacity-sum(requested))*MaxNodeScore/capacity) + memory((capacity-sum(requested))*MaxNodeScore/capacity))/weightSum
return la.score(pod, nodeInfo)
}
// ScoreExtensions of the Score plugin.
func (la *LeastAllocated) ScoreExtensions() framework.ScoreExtensions {
return nil
}
// NewLeastAllocated initializes a new plugin and returns it.
func NewLeastAllocated(laArgs runtime.Object, h framework.Handle, fts feature.Features) (framework.Plugin, error) {
args, ok := laArgs.(*config.NodeResourcesLeastAllocatedArgs)
if !ok {
return nil, fmt.Errorf("want args to be of type NodeResourcesLeastAllocatedArgs, got %T", laArgs)
}
if err := validation.ValidateNodeResourcesLeastAllocatedArgs(nil, args); err != nil {
return nil, err
}
resToWeightMap := make(resourceToWeightMap)
for _, resource := range (*args).Resources {
resToWeightMap[v1.ResourceName(resource.Name)] = resource.Weight
}
return &LeastAllocated{
handle: h,
resourceAllocationScorer: resourceAllocationScorer{
Name: LeastAllocatedName,
scorer: leastResourceScorer(resToWeightMap),
resourceToWeightMap: resToWeightMap,
enablePodOverhead: fts.EnablePodOverhead,
},
}, nil
}
func leastResourceScorer(resToWeightMap resourceToWeightMap) func(resourceToValueMap, resourceToValueMap) int64 { func leastResourceScorer(resToWeightMap resourceToWeightMap) func(resourceToValueMap, resourceToValueMap) int64 {
return func(requested, allocable resourceToValueMap) int64 { return func(requested, allocable resourceToValueMap) int64 {
var nodeScore, weightSum int64 var nodeScore, weightSum int64

414
pkg/scheduler/framework/plugins/noderesources/least_allocated_test.go
View File

@ -18,104 +18,40 @@ package noderesources
import ( import (
"context" "context"
"reflect"
"testing" "testing"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" plfeature "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
"k8s.io/kubernetes/pkg/scheduler/framework/runtime" "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
"k8s.io/kubernetes/pkg/scheduler/internal/cache" "k8s.io/kubernetes/pkg/scheduler/internal/cache"
st "k8s.io/kubernetes/pkg/scheduler/testing"
) )
func TestNodeResourcesLeastAllocated(t *testing.T) { func TestLeastAllocatedScoringStrategy(t *testing.T) {
labels1 := map[string]string{ defaultResources := []config.ResourceSpec{
"foo": "bar",
"baz": "blah",
}
labels2 := map[string]string{
"bar": "foo",
"baz": "blah",
}
machine1Spec := v1.PodSpec{
NodeName: "machine1",
}
machine2Spec := v1.PodSpec{
NodeName: "machine2",
}
noResources := v1.PodSpec{
Containers: []v1.Container{},
}
cpuOnly := v1.PodSpec{
NodeName: "machine1",
Containers: []v1.Container{
{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("1000m"),
v1.ResourceMemory: resource.MustParse("0"),
},
},
},
{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("2000m"),
v1.ResourceMemory: resource.MustParse("0"),
},
},
},
},
}
cpuOnly2 := cpuOnly
cpuOnly2.NodeName = "machine2"
cpuAndMemory := v1.PodSpec{
NodeName: "machine2",
Containers: []v1.Container{
{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("1000m"),
v1.ResourceMemory: resource.MustParse("2000"),
},
},
},
{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("2000m"),
v1.ResourceMemory: resource.MustParse("3000"),
},
},
},
},
}
defaultResourceLeastAllocatedSet := []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1}, {Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1}, {Name: string(v1.ResourceMemory), Weight: 1},
} }
extendedRes := "abc.com/xyz" extendedRes := "abc.com/xyz"
extendedResourceLeastAllocatedSet := []config.ResourceSpec{ extendedResourceLeastAllocatedSet := []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1}, {Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1}, {Name: string(v1.ResourceMemory), Weight: 1},
{Name: extendedRes, Weight: 1}, {Name: extendedRes, Weight: 1},
} }
cpuMemoryAndExtendedRes := *cpuAndMemory.DeepCopy()
cpuMemoryAndExtendedRes.Containers[0].Resources.Requests[v1.ResourceName(extendedRes)] = resource.MustParse("2")
tests := []struct { tests := []struct {
pod *v1.Pod name string
pods []*v1.Pod requestedPod *v1.Pod
nodes []*v1.Node nodes []*v1.Node
args config.NodeResourcesLeastAllocatedArgs existingPods []*v1.Pod
wantErr error expectedScores framework.NodeScoreList
expectedList framework.NodeScoreList resources []config.ResourceSpec
name string wantErrs field.ErrorList
}{ }{
{ {
// Node1 scores (remaining resources) on 0-MaxNodeScore scale // Node1 scores (remaining resources) on 0-MaxNodeScore scale
@ -126,11 +62,15 @@ func TestNodeResourcesLeastAllocated(t *testing.T) {
// CPU Score: ((4000 - 0) * MaxNodeScore) / 4000 = MaxNodeScore // CPU Score: ((4000 - 0) * MaxNodeScore) / 4000 = MaxNodeScore
// Memory Score: ((10000 - 0) * MaxNodeScore) / 10000 = MaxNodeScore // Memory Score: ((10000 - 0) * MaxNodeScore) / 10000 = MaxNodeScore
// Node2 Score: (MaxNodeScore + MaxNodeScore) / 2 = MaxNodeScore // Node2 Score: (MaxNodeScore + MaxNodeScore) / 2 = MaxNodeScore
pod: &v1.Pod{Spec: noResources},
nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)},
args: config.NodeResourcesLeastAllocatedArgs{Resources: defaultResourceLeastAllocatedSet},
expectedList: []framework.NodeScore{{Name: "machine1", Score: framework.MaxNodeScore}, {Name: "machine2", Score: framework.MaxNodeScore}},
name: "nothing scheduled, nothing requested", name: "nothing scheduled, nothing requested",
requestedPod: st.MakePod().Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
},
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: framework.MaxNodeScore}, {Name: "node2", Score: framework.MaxNodeScore}},
resources: defaultResources,
}, },
{ {
// Node1 scores on 0-MaxNodeScore scale // Node1 scores on 0-MaxNodeScore scale
@ -141,18 +81,32 @@ func TestNodeResourcesLeastAllocated(t *testing.T) {
// CPU Score: ((6000 - 3000) * MaxNodeScore) / 6000 = 50 // CPU Score: ((6000 - 3000) * MaxNodeScore) / 6000 = 50
// Memory Score: ((10000 - 5000) * MaxNodeScore) / 10000 = 50 // Memory Score: ((10000 - 5000) * MaxNodeScore) / 10000 = 50
// Node2 Score: (50 + 50) / 2 = 50 // Node2 Score: (50 + 50) / 2 = 50
pod: &v1.Pod{Spec: cpuAndMemory}, name: "nothing scheduled, resources requested, differently sized machines",
nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)}, requestedPod: st.MakePod().
args: config.NodeResourcesLeastAllocatedArgs{Resources: defaultResourceLeastAllocatedSet}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
expectedList: []framework.NodeScore{{Name: "machine1", Score: 37}, {Name: "machine2", Score: 50}}, Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
name: "nothing scheduled, resources requested, differently sized machines", Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: 37}, {Name: "node2", Score: 50}},
resources: defaultResources,
}, },
{ {
pod: &v1.Pod{Spec: cpuAndMemory}, name: "Resources not set, nothing scheduled, resources requested, differently sized machines",
nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)}, requestedPod: st.MakePod().
args: config.NodeResourcesLeastAllocatedArgs{Resources: []config.ResourceSpec{}}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
expectedList: []framework.NodeScore{{Name: "machine1", Score: 0}, {Name: "machine2", Score: 0}}, Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
name: "Resources not set, nothing scheduled, resources requested, differently sized machines", Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: framework.MinNodeScore}, {Name: "node2", Score: framework.MinNodeScore}},
resources: nil,
}, },
{ {
// Node1 scores on 0-MaxNodeScore scale // Node1 scores on 0-MaxNodeScore scale
@ -163,17 +117,20 @@ func TestNodeResourcesLeastAllocated(t *testing.T) {
// CPU Score: ((4000 - 0) * MaxNodeScore) / 4000 = MaxNodeScore // CPU Score: ((4000 - 0) * MaxNodeScore) / 4000 = MaxNodeScore
// Memory Score: ((10000 - 0) * MaxNodeScore) / 10000 = MaxNodeScore // Memory Score: ((10000 - 0) * MaxNodeScore) / 10000 = MaxNodeScore
// Node2 Score: (MaxNodeScore + MaxNodeScore) / 2 = MaxNodeScore // Node2 Score: (MaxNodeScore + MaxNodeScore) / 2 = MaxNodeScore
pod: &v1.Pod{Spec: noResources},
nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)},
args: config.NodeResourcesLeastAllocatedArgs{Resources: defaultResourceLeastAllocatedSet},
expectedList: []framework.NodeScore{{Name: "machine1", Score: framework.MaxNodeScore}, {Name: "machine2", Score: framework.MaxNodeScore}},
name: "no resources requested, pods scheduled", name: "no resources requested, pods scheduled",
pods: []*v1.Pod{ requestedPod: st.MakePod().Obj(),
{Spec: machine1Spec, ObjectMeta: metav1.ObjectMeta{Labels: labels2}}, nodes: []*v1.Node{
{Spec: machine1Spec, ObjectMeta: metav1.ObjectMeta{Labels: labels1}}, st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
{Spec: machine2Spec, ObjectMeta: metav1.ObjectMeta{Labels: labels1}}, st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
{Spec: machine2Spec, ObjectMeta: metav1.ObjectMeta{Labels: labels1}},
}, },
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Obj(),
st.MakePod().Node("node1").Obj(),
st.MakePod().Node("node2").Obj(),
st.MakePod().Node("node2").Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: framework.MaxNodeScore}, {Name: "node2", Score: framework.MaxNodeScore}},
resources: defaultResources,
}, },
{ {
// Node1 scores on 0-MaxNodeScore scale // Node1 scores on 0-MaxNodeScore scale
@ -184,17 +141,20 @@ func TestNodeResourcesLeastAllocated(t *testing.T) {
// CPU Score: ((10000 - 6000) * MaxNodeScore) / 10000 = 40 // CPU Score: ((10000 - 6000) * MaxNodeScore) / 10000 = 40
// Memory Score: ((20000 - 5000) * MaxNodeScore) / 20000 = 75 // Memory Score: ((20000 - 5000) * MaxNodeScore) / 20000 = 75
// Node2 Score: (40 + 75) / 2 = 57 // Node2 Score: (40 + 75) / 2 = 57
pod: &v1.Pod{Spec: noResources},
nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)},
args: config.NodeResourcesLeastAllocatedArgs{Resources: defaultResourceLeastAllocatedSet},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 70}, {Name: "machine2", Score: 57}},
name: "no resources requested, pods scheduled with resources", name: "no resources requested, pods scheduled with resources",
pods: []*v1.Pod{ requestedPod: st.MakePod().Obj(),
{Spec: cpuOnly, ObjectMeta: metav1.ObjectMeta{Labels: labels2}}, nodes: []*v1.Node{
{Spec: cpuOnly, ObjectMeta: metav1.ObjectMeta{Labels: labels1}}, st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "10000", "memory": "20000"}).Obj(),
{Spec: cpuOnly2, ObjectMeta: metav1.ObjectMeta{Labels: labels1}}, st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "10000", "memory": "20000"}).Obj(),
{Spec: cpuAndMemory, ObjectMeta: metav1.ObjectMeta{Labels: labels1}},
}, },
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: 70}, {Name: "node2", Score: 57}},
resources: defaultResources,
}, },
{ {
// Node1 scores on 0-MaxNodeScore scale // Node1 scores on 0-MaxNodeScore scale
@ -205,15 +165,21 @@ func TestNodeResourcesLeastAllocated(t *testing.T) {
// CPU Score: ((10000 - 6000) * MaxNodeScore) / 10000 = 40 // CPU Score: ((10000 - 6000) * MaxNodeScore) / 10000 = 40
// Memory Score: ((20000 - 10000) * MaxNodeScore) / 20000 = 50 // Memory Score: ((20000 - 10000) * MaxNodeScore) / 20000 = 50
// Node2 Score: (40 + 50) / 2 = 45 // Node2 Score: (40 + 50) / 2 = 45
pod: &v1.Pod{Spec: cpuAndMemory}, name: "resources requested, pods scheduled with resources",
nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)}, requestedPod: st.MakePod().
args: config.NodeResourcesLeastAllocatedArgs{Resources: defaultResourceLeastAllocatedSet}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
expectedList: []framework.NodeScore{{Name: "machine1", Score: 57}, {Name: "machine2", Score: 45}}, Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
name: "resources requested, pods scheduled with resources", Obj(),
pods: []*v1.Pod{ nodes: []*v1.Node{
{Spec: cpuOnly}, st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "10000", "memory": "20000"}).Obj(),
{Spec: cpuAndMemory}, st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "10000", "memory": "20000"}).Obj(),
}, },
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: 57}, {Name: "node2", Score: 45}},
resources: defaultResources,
}, },
{ {
// Node1 scores on 0-MaxNodeScore scale // Node1 scores on 0-MaxNodeScore scale
@ -224,15 +190,21 @@ func TestNodeResourcesLeastAllocated(t *testing.T) {
// CPU Score: ((10000 - 6000) * MaxNodeScore) / 10000 = 40 // CPU Score: ((10000 - 6000) * MaxNodeScore) / 10000 = 40
// Memory Score: ((50000 - 10000) * MaxNodeScore) / 50000 = 80 // Memory Score: ((50000 - 10000) * MaxNodeScore) / 50000 = 80
// Node2 Score: (40 + 80) / 2 = 60 // Node2 Score: (40 + 80) / 2 = 60
pod: &v1.Pod{Spec: cpuAndMemory}, name: "resources requested, pods scheduled with resources, differently sized machines",
nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 50000)}, requestedPod: st.MakePod().
args: config.NodeResourcesLeastAllocatedArgs{Resources: defaultResourceLeastAllocatedSet}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
expectedList: []framework.NodeScore{{Name: "machine1", Score: 57}, {Name: "machine2", Score: 60}}, Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
name: "resources requested, pods scheduled with resources, differently sized machines", Obj(),
pods: []*v1.Pod{ nodes: []*v1.Node{
{Spec: cpuOnly}, st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "10000", "memory": "20000"}).Obj(),
{Spec: cpuAndMemory}, st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "10000", "memory": "50000"}).Obj(),
}, },
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: 57}, {Name: "node2", Score: 60}},
resources: defaultResources,
}, },
{ {
// Node1 scores on 0-MaxNodeScore scale // Node1 scores on 0-MaxNodeScore scale
@ -243,26 +215,32 @@ func TestNodeResourcesLeastAllocated(t *testing.T) {
// CPU Score: ((4000 - 6000) * MaxNodeScore) / 4000 = 0 // CPU Score: ((4000 - 6000) * MaxNodeScore) / 4000 = 0
// Memory Score: ((10000 - 5000) * MaxNodeScore) / 10000 = 50 // Memory Score: ((10000 - 5000) * MaxNodeScore) / 10000 = 50
// Node2 Score: (0 + 50) / 2 = 25 // Node2 Score: (0 + 50) / 2 = 25
pod: &v1.Pod{Spec: cpuOnly},
nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)},
args: config.NodeResourcesLeastAllocatedArgs{Resources: defaultResourceLeastAllocatedSet},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 50}, {Name: "machine2", Score: 25}},
name: "requested resources exceed node capacity", name: "requested resources exceed node capacity",
pods: []*v1.Pod{ requestedPod: st.MakePod().Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
{Spec: cpuOnly}, nodes: []*v1.Node{
{Spec: cpuAndMemory}, st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
}, },
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: 50}, {Name: "node2", Score: 25}},
resources: defaultResources,
}, },
{ {
pod: &v1.Pod{Spec: noResources},
nodes: []*v1.Node{makeNode("machine1", 0, 0), makeNode("machine2", 0, 0)},
args: config.NodeResourcesLeastAllocatedArgs{Resources: defaultResourceLeastAllocatedSet},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 0}, {Name: "machine2", Score: 0}},
name: "zero node resources, pods scheduled with resources", name: "zero node resources, pods scheduled with resources",
pods: []*v1.Pod{ requestedPod: st.MakePod().Obj(),
{Spec: cpuOnly}, nodes: []*v1.Node{
{Spec: cpuAndMemory}, st.MakeNode().Name("node1").Obj(),
st.MakeNode().Name("node2").Obj(),
}, },
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: framework.MinNodeScore}, {Name: "node2", Score: framework.MinNodeScore}},
resources: defaultResources,
}, },
{ {
// CPU Score: ((4000 - 3000) *100) / 4000 = 25 // CPU Score: ((4000 - 3000) *100) / 4000 = 25
@ -271,50 +249,86 @@ func TestNodeResourcesLeastAllocated(t *testing.T) {
// CPU Score: ((6000 - 3000) *100) / 6000 = 50 // CPU Score: ((6000 - 3000) *100) / 6000 = 50
// Memory Score: ((10000 - 5000) *100) / 10000 = 50 // Memory Score: ((10000 - 5000) *100) / 10000 = 50
// Node2 Score: (50 * 1 + 50 * 2) / (1 + 2) = 50 // Node2 Score: (50 * 1 + 50 * 2) / (1 + 2) = 50
pod: &v1.Pod{Spec: cpuAndMemory}, name: "nothing scheduled, resources requested with different weight on CPU and memory, differently sized machines",
nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)}, requestedPod: st.MakePod().Node("node1").
args: config.NodeResourcesLeastAllocatedArgs{Resources: []config.ResourceSpec{{Name: "memory", Weight: 2}, {Name: "cpu", Weight: 1}}}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
expectedList: []framework.NodeScore{{Name: "machine1", Score: 41}, {Name: "machine2", Score: 50}}, Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
name: "nothing scheduled, resources requested with different weight on CPU and memory, differently sized machines", Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: 41}, {Name: "node2", Score: 50}},
resources: []config.ResourceSpec{
{Name: "memory", Weight: 2},
{Name: "cpu", Weight: 1},
},
}, },
{ {
// resource with negative weight is not allowed // resource with negative weight is not allowed
pod: &v1.Pod{Spec: cpuAndMemory}, name: "resource with negative weight",
nodes: []*v1.Node{makeNode("machine", 4000, 10000)}, requestedPod: st.MakePod().Node("node1").
args: config.NodeResourcesLeastAllocatedArgs{Resources: []config.ResourceSpec{{Name: "memory", Weight: -1}, {Name: "cpu", Weight: 1}}}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
wantErr: field.ErrorList{ Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
},
resources: []config.ResourceSpec{
{Name: "memory", Weight: -1},
{Name: "cpu", Weight: 1},
},
wantErrs: field.ErrorList{
&field.Error{ &field.Error{
Type: field.ErrorTypeInvalid, Type: field.ErrorTypeInvalid,
Field: "resources[0].weight", Field: "resources[0].weight",
}, },
}.ToAggregate(), },
name: "resource with negtive weight",
}, },
{ {
// resource with zero weight is not allowed // resource with zero weight is not allowed
pod: &v1.Pod{Spec: cpuAndMemory}, name: "resource with zero weight",
nodes: []*v1.Node{makeNode("machine", 4000, 10000)}, requestedPod: st.MakePod().Node("node1").
args: config.NodeResourcesLeastAllocatedArgs{Resources: []config.ResourceSpec{{Name: "memory", Weight: 1}, {Name: "cpu", Weight: 0}}}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
wantErr: field.ErrorList{ Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
},
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: 41}, {Name: "node2", Score: 50}},
resources: []config.ResourceSpec{
{Name: "memory", Weight: 1},
{Name: "cpu", Weight: 0},
},
wantErrs: field.ErrorList{
&field.Error{ &field.Error{
Type: field.ErrorTypeInvalid, Type: field.ErrorTypeInvalid,
Field: "resources[1].weight", Field: "resources[1].weight",
}, },
}.ToAggregate(), },
name: "resource with zero weight",
}, },
{ {
// resource weight should be less than MaxNodeScore // resource weight should be less than MaxNodeScore
pod: &v1.Pod{Spec: cpuAndMemory}, name: "resource weight larger than MaxNodeScore",
nodes: []*v1.Node{makeNode("machine", 4000, 10000)}, requestedPod: st.MakePod().Node("node1").
args: config.NodeResourcesLeastAllocatedArgs{Resources: []config.ResourceSpec{{Name: "memory", Weight: 120}}}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
wantErr: field.ErrorList{ Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
},
resources: []config.ResourceSpec{
{Name: "memory", Weight: 1},
{Name: "cpu", Weight: 101},
},
wantErrs: field.ErrorList{
&field.Error{ &field.Error{
Type: field.ErrorTypeInvalid, Type: field.ErrorTypeInvalid,
Field: "resources[0].weight", Field: "resources[1].weight",
}, },
}.ToAggregate(), },
name: "resource weight larger than MaxNodeScore",
}, },
{ {
// Bypass extended resource if the pod does not request. // Bypass extended resource if the pod does not request.
@ -323,14 +337,17 @@ func TestNodeResourcesLeastAllocated(t *testing.T) {
// the final scores are: // the final scores are:
// - node1: (50 + 50) / 2 = 50 // - node1: (50 + 50) / 2 = 50
// - node2: (50 + 50) / 2 = 50 // - node2: (50 + 50) / 2 = 50
pod: &v1.Pod{Spec: cpuAndMemory}, name: "bypass extended resource if the pod does not request",
requestedPod: st.MakePod().Node("node1").
Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
Obj(),
nodes: []*v1.Node{ nodes: []*v1.Node{
makeNode("machine1", 6000, 10000), st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
makeNodeWithExtendedResource("machine2", 6000, 10000, map[string]int64{extendedRes: 4}), st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000", v1.ResourceName(extendedRes): "4"}).Obj(),
}, },
args: config.NodeResourcesLeastAllocatedArgs{Resources: extendedResourceLeastAllocatedSet}, expectedScores: []framework.NodeScore{{Name: "node1", Score: 50}, {Name: "node2", Score: 50}},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 50}, {Name: "machine2", Score: 50}}, resources: extendedResourceLeastAllocatedSet,
name: "bypass extended resource if the pod does not request",
}, },
{ {
// Honor extended resource if the pod requests. // Honor extended resource if the pod requests.
@ -341,47 +358,52 @@ func TestNodeResourcesLeastAllocated(t *testing.T) {
// So the final scores are: // So the final scores are:
// - node1: (50 + 50 + 50) / 3 = 50 // - node1: (50 + 50 + 50) / 3 = 50
// - node2: (50 + 50 + 80) / 3 = 60 // - node2: (50 + 50 + 80) / 3 = 60
pod: &v1.Pod{Spec: cpuMemoryAndExtendedRes}, name: "honor extended resource if the pod requests",
requestedPod: st.MakePod().Node("node1").
Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000", v1.ResourceName(extendedRes): "2"}).
Obj(),
nodes: []*v1.Node{ nodes: []*v1.Node{
makeNodeWithExtendedResource("machine1", 6000, 10000, map[string]int64{extendedRes: 4}), st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000", v1.ResourceName(extendedRes): "4"}).Obj(),
makeNodeWithExtendedResource("machine2", 6000, 10000, map[string]int64{extendedRes: 10}), st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000", v1.ResourceName(extendedRes): "10"}).Obj(),
}, },
args: config.NodeResourcesLeastAllocatedArgs{Resources: extendedResourceLeastAllocatedSet}, existingPods: nil,
expectedList: []framework.NodeScore{{Name: "machine1", Score: 50}, {Name: "machine2", Score: 60}}, expectedScores: []framework.NodeScore{{Name: "node1", Score: 50}, {Name: "node2", Score: 60}},
name: "honor extended resource if the pod requests", resources: extendedResourceLeastAllocatedSet,
}, },
} }
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
snapshot := cache.NewSnapshot(test.pods, test.nodes) state := framework.NewCycleState()
snapshot := cache.NewSnapshot(test.existingPods, test.nodes)
fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot)) fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot))
p, err := NewLeastAllocated(&test.args, fh, feature.Features{EnablePodOverhead: true})
if test.wantErr != nil { p, err := NewFit(
if err != nil { &config.NodeResourcesFitArgs{
diff := cmp.Diff(test.wantErr, err, cmpopts.IgnoreFields(field.Error{}, "BadValue", "Detail")) ScoringStrategy: &config.ScoringStrategy{
if diff != "" { Type: config.LeastAllocated,
t.Fatalf("got err (-want,+got):\n%s", diff) Resources: test.resources,
} },
} else { }, fh, plfeature.Features{EnablePodOverhead: true})
t.Fatalf("no error produced, wanted %v", test.wantErr)
} if diff := cmp.Diff(test.wantErrs.ToAggregate(), err, ignoreBadValueDetail); diff != "" {
t.Fatalf("got err (-want,+got):\n%s", diff)
}
if err != nil {
return return
} }
if err != nil && test.wantErr == nil { var gotScores framework.NodeScoreList
t.Fatalf("failed to initialize plugin NodeResourcesLeastAllocated, got error: %v", err) for _, n := range test.nodes {
score, status := p.(framework.ScorePlugin).Score(context.Background(), state, test.requestedPod, n.Name)
if !status.IsSuccess() {
t.Errorf("unexpected error: %v", status)
}
gotScores = append(gotScores, framework.NodeScore{Name: n.Name, Score: score})
} }
for i := range test.nodes { if diff := cmp.Diff(test.expectedScores, gotScores); diff != "" {
hostResult, err := p.(framework.ScorePlugin).Score(context.Background(), nil, test.pod, test.nodes[i].Name) t.Errorf("Unexpected scores (-want,+got):\n%s", diff)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
if !reflect.DeepEqual(test.expectedList[i].Score, hostResult) {
t.Errorf("expected %#v, got %#v", test.expectedList[i].Score, hostResult)
}
} }
}) })
} }

76
pkg/scheduler/framework/plugins/noderesources/most_allocated.go
View File

@ -17,79 +17,15 @@ limitations under the License.
package noderesources package noderesources
import ( import (
"context"
"fmt"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/apis/config/validation"
"k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/names"
) )
// MostAllocated is a score plugin that favors nodes with high allocation based on requested resources. // mostResourceScorer favors nodes with most requested resources.
type MostAllocated struct { // It calculates the percentage of memory and CPU requested by pods scheduled on the node, and prioritizes
handle framework.Handle // based on the maximum of the average of the fraction of requested to capacity.
resourceAllocationScorer //
} // Details:
// (cpu(MaxNodeScore * sum(requested) / capacity) + memory(MaxNodeScore * sum(requested) / capacity)) / weightSum
var _ = framework.ScorePlugin(&MostAllocated{})
// MostAllocatedName is the name of the plugin used in the plugin registry and configurations.
const MostAllocatedName = names.NodeResourcesMostAllocated
// Name returns name of the plugin. It is used in logs, etc.
func (ma *MostAllocated) Name() string {
return MostAllocatedName
}
// Score invoked at the Score extension point.
func (ma *MostAllocated) Score(ctx context.Context, state *framework.CycleState, pod *v1.Pod, nodeName string) (int64, *framework.Status) {
nodeInfo, err := ma.handle.SnapshotSharedLister().NodeInfos().Get(nodeName)
if err != nil {
return 0, framework.AsStatus(fmt.Errorf("getting node %q from Snapshot: %w", nodeName, err))
}
// ma.score favors nodes with most requested resources.
// It calculates the percentage of memory and CPU requested by pods scheduled on the node, and prioritizes
// based on the maximum of the average of the fraction of requested to capacity.
// Details: (cpu(MaxNodeScore * sum(requested) / capacity) + memory(MaxNodeScore * sum(requested) / capacity)) / weightSum
return ma.score(pod, nodeInfo)
}
// ScoreExtensions of the Score plugin.
func (ma *MostAllocated) ScoreExtensions() framework.ScoreExtensions {
return nil
}
// NewMostAllocated initializes a new plugin and returns it.
func NewMostAllocated(maArgs runtime.Object, h framework.Handle, fts feature.Features) (framework.Plugin, error) {
args, ok := maArgs.(*config.NodeResourcesMostAllocatedArgs)
if !ok {
return nil, fmt.Errorf("want args to be of type NodeResourcesMostAllocatedArgs, got %T", args)
}
if err := validation.ValidateNodeResourcesMostAllocatedArgs(nil, args); err != nil {
return nil, err
}
resToWeightMap := make(resourceToWeightMap)
for _, resource := range (*args).Resources {
resToWeightMap[v1.ResourceName(resource.Name)] = resource.Weight
}
return &MostAllocated{
handle: h,
resourceAllocationScorer: resourceAllocationScorer{
Name: MostAllocatedName,
scorer: mostResourceScorer(resToWeightMap),
resourceToWeightMap: resToWeightMap,
enablePodOverhead: fts.EnablePodOverhead,
},
}, nil
}
func mostResourceScorer(resToWeightMap resourceToWeightMap) func(requested, allocable resourceToValueMap) int64 { func mostResourceScorer(resToWeightMap resourceToWeightMap) func(requested, allocable resourceToValueMap) int64 {
return func(requested, allocable resourceToValueMap) int64 { return func(requested, allocable resourceToValueMap) int64 {
var nodeScore, weightSum int64 var nodeScore, weightSum int64

396
pkg/scheduler/framework/plugins/noderesources/most_allocated_test.go
View File

@ -18,126 +18,39 @@ package noderesources
import ( import (
"context" "context"
"reflect"
"testing" "testing"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" plfeature "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
"k8s.io/kubernetes/pkg/scheduler/framework/runtime" "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
"k8s.io/kubernetes/pkg/scheduler/internal/cache" "k8s.io/kubernetes/pkg/scheduler/internal/cache"
st "k8s.io/kubernetes/pkg/scheduler/testing"
) )
func TestNodeResourcesMostAllocated(t *testing.T) { func TestMostAllocatedScoringStrategy(t *testing.T) {
labels1 := map[string]string{ defaultResources := []config.ResourceSpec{
"foo": "bar",
"baz": "blah",
}
labels2 := map[string]string{
"bar": "foo",
"baz": "blah",
}
noResources := v1.PodSpec{
Containers: []v1.Container{},
}
cpuOnly := v1.PodSpec{
NodeName: "machine1",
Containers: []v1.Container{
{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("1000m"),
v1.ResourceMemory: resource.MustParse("0"),
},
},
},
{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("2000m"),
v1.ResourceMemory: resource.MustParse("0"),
},
},
},
},
}
cpuOnly2 := cpuOnly
cpuOnly2.NodeName = "machine2"
cpuAndMemory := v1.PodSpec{
NodeName: "machine2",
Containers: []v1.Container{
{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("1000m"),
v1.ResourceMemory: resource.MustParse("2000"),
},
},
},
{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("2000m"),
v1.ResourceMemory: resource.MustParse("3000"),
},
},
},
},
}
bigCPUAndMemory := v1.PodSpec{
NodeName: "machine1",
Containers: []v1.Container{
{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("2000m"),
v1.ResourceMemory: resource.MustParse("4000"),
},
},
},
{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("3000m"),
v1.ResourceMemory: resource.MustParse("5000"),
},
},
},
},
}
nonZeroContainer := v1.PodSpec{
Containers: []v1.Container{{}},
}
nonZeroContainer1 := v1.PodSpec{
NodeName: "machine1",
Containers: []v1.Container{{}},
}
defaultResourceMostAllocatedSet := []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1}, {Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1}, {Name: string(v1.ResourceMemory), Weight: 1},
} }
extendedRes := "abc.com/xyz" extendedRes := "abc.com/xyz"
extendedResourceMostAllocatedSet := []config.ResourceSpec{ extendedResourceLeastAllocatedSet := []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1}, {Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1}, {Name: string(v1.ResourceMemory), Weight: 1},
{Name: extendedRes, Weight: 1}, {Name: extendedRes, Weight: 1},
} }
cpuMemoryAndExtendedRes := *cpuAndMemory.DeepCopy()
cpuMemoryAndExtendedRes.Containers[0].Resources.Requests[v1.ResourceName(extendedRes)] = resource.MustParse("2")
tests := []struct { tests := []struct {
pod *v1.Pod name string
pods []*v1.Pod requestedPod *v1.Pod
nodes []*v1.Node nodes []*v1.Node
args config.NodeResourcesMostAllocatedArgs existingPods []*v1.Pod
wantErr error expectedScores framework.NodeScoreList
expectedList framework.NodeScoreList resources []config.ResourceSpec
name string wantErrs field.ErrorList
}{ }{
{ {
// Node1 scores (used resources) on 0-MaxNodeScore scale // Node1 scores (used resources) on 0-MaxNodeScore scale
@ -148,11 +61,15 @@ func TestNodeResourcesMostAllocated(t *testing.T) {
// CPU Score: (0 * MaxNodeScore) / 4000 = 0 // CPU Score: (0 * MaxNodeScore) / 4000 = 0
// Memory Score: (0 * MaxNodeScore) / 10000 = 0 // Memory Score: (0 * MaxNodeScore) / 10000 = 0
// Node2 Score: (0 + 0) / 2 = 0 // Node2 Score: (0 + 0) / 2 = 0
pod: &v1.Pod{Spec: noResources},
nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)},
args: config.NodeResourcesMostAllocatedArgs{Resources: defaultResourceMostAllocatedSet},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 0}, {Name: "machine2", Score: 0}},
name: "nothing scheduled, nothing requested", name: "nothing scheduled, nothing requested",
requestedPod: st.MakePod().Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
},
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: framework.MinNodeScore}, {Name: "node2", Score: framework.MinNodeScore}},
resources: defaultResources,
}, },
{ {
// Node1 scores on 0-MaxNodeScore scale // Node1 scores on 0-MaxNodeScore scale
@ -163,18 +80,32 @@ func TestNodeResourcesMostAllocated(t *testing.T) {
// CPU Score: (3000 * MaxNodeScore) / 6000 = 50 // CPU Score: (3000 * MaxNodeScore) / 6000 = 50
// Memory Score: (5000 * MaxNodeScore) / 10000 = 50 // Memory Score: (5000 * MaxNodeScore) / 10000 = 50
// Node2 Score: (50 + 50) / 2 = 50 // Node2 Score: (50 + 50) / 2 = 50
pod: &v1.Pod{Spec: cpuAndMemory}, name: "nothing scheduled, resources requested, differently sized machines",
nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)}, requestedPod: st.MakePod().
args: config.NodeResourcesMostAllocatedArgs{Resources: defaultResourceMostAllocatedSet}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
expectedList: []framework.NodeScore{{Name: "machine1", Score: 62}, {Name: "machine2", Score: 50}}, Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
name: "nothing scheduled, resources requested, differently sized machines", Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: 62}, {Name: "node2", Score: 50}},
resources: defaultResources,
}, },
{ {
pod: &v1.Pod{Spec: cpuAndMemory}, name: "Resources not set, nothing scheduled, resources requested, differently sized machines",
nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)}, requestedPod: st.MakePod().
args: config.NodeResourcesMostAllocatedArgs{Resources: []config.ResourceSpec{}}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
expectedList: []framework.NodeScore{{Name: "machine1", Score: 0}, {Name: "machine2", Score: 0}}, Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
name: "Resources not set, nothing scheduled, resources requested, differently sized machines", Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: framework.MinNodeScore}, {Name: "node2", Score: framework.MinNodeScore}},
resources: nil,
}, },
{ {
// Node1 scores on 0-MaxNodeScore scale // Node1 scores on 0-MaxNodeScore scale
@ -185,17 +116,20 @@ func TestNodeResourcesMostAllocated(t *testing.T) {
// CPU Score: (6000 * MaxNodeScore) / 10000 = 60 // CPU Score: (6000 * MaxNodeScore) / 10000 = 60
// Memory Score: (5000 * MaxNodeScore) / 20000 = 25 // Memory Score: (5000 * MaxNodeScore) / 20000 = 25
// Node2 Score: (60 + 25) / 2 = 42 // Node2 Score: (60 + 25) / 2 = 42
pod: &v1.Pod{Spec: noResources},
nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)},
args: config.NodeResourcesMostAllocatedArgs{Resources: defaultResourceMostAllocatedSet},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 30}, {Name: "machine2", Score: 42}},
name: "no resources requested, pods scheduled with resources", name: "no resources requested, pods scheduled with resources",
pods: []*v1.Pod{ requestedPod: st.MakePod().Obj(),
{Spec: cpuOnly, ObjectMeta: metav1.ObjectMeta{Labels: labels2}}, nodes: []*v1.Node{
{Spec: cpuOnly, ObjectMeta: metav1.ObjectMeta{Labels: labels1}}, st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "10000", "memory": "20000"}).Obj(),
{Spec: cpuOnly2, ObjectMeta: metav1.ObjectMeta{Labels: labels1}}, st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "10000", "memory": "20000"}).Obj(),
{Spec: cpuAndMemory, ObjectMeta: metav1.ObjectMeta{Labels: labels1}},
}, },
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: 30}, {Name: "node2", Score: 42}},
resources: defaultResources,
}, },
{ {
// Node1 scores on 0-MaxNodeScore scale // Node1 scores on 0-MaxNodeScore scale
@ -206,15 +140,21 @@ func TestNodeResourcesMostAllocated(t *testing.T) {
// CPU Score: (6000 * MaxNodeScore) / 10000 = 60 // CPU Score: (6000 * MaxNodeScore) / 10000 = 60
// Memory Score: (10000 * MaxNodeScore) / 20000 = 50 // Memory Score: (10000 * MaxNodeScore) / 20000 = 50
// Node2 Score: (60 + 50) / 2 = 55 // Node2 Score: (60 + 50) / 2 = 55
pod: &v1.Pod{Spec: cpuAndMemory}, name: "resources requested, pods scheduled with resources",
nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)}, requestedPod: st.MakePod().
args: config.NodeResourcesMostAllocatedArgs{Resources: defaultResourceMostAllocatedSet}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
expectedList: []framework.NodeScore{{Name: "machine1", Score: 42}, {Name: "machine2", Score: 55}}, Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
name: "resources requested, pods scheduled with resources", Obj(),
pods: []*v1.Pod{ nodes: []*v1.Node{
{Spec: cpuOnly}, st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "10000", "memory": "20000"}).Obj(),
{Spec: cpuAndMemory}, st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "10000", "memory": "20000"}).Obj(),
}, },
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "0"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: 42}, {Name: "node2", Score: 55}},
resources: defaultResources,
}, },
{ {
// Node1 scores on 0-MaxNodeScore scale // Node1 scores on 0-MaxNodeScore scale
@ -225,11 +165,18 @@ func TestNodeResourcesMostAllocated(t *testing.T) {
// CPU Score: (5000 * MaxNodeScore) / 10000 = 50 // CPU Score: (5000 * MaxNodeScore) / 10000 = 50
// Memory Score: 8000 *MaxNodeScore / 8000 return 100 // Memory Score: 8000 *MaxNodeScore / 8000 return 100
// Node2 Score: (50 + 100) / 2 = 75 // Node2 Score: (50 + 100) / 2 = 75
pod: &v1.Pod{Spec: bigCPUAndMemory}, name: "resources requested equal node capacity",
nodes: []*v1.Node{makeNode("machine1", 5000, 10000), makeNode("machine2", 10000, 9000)}, requestedPod: st.MakePod().
args: config.NodeResourcesMostAllocatedArgs{Resources: defaultResourceMostAllocatedSet}, Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "4000"}).
expectedList: []framework.NodeScore{{Name: "machine1", Score: 95}, {Name: "machine2", Score: 75}}, Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).
name: "resources requested equal node capacity", Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "5000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "10000", "memory": "9000"}).Obj(),
},
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: 95}, {Name: "node2", Score: 75}},
resources: defaultResources,
}, },
{ {
// CPU Score: (3000 *100) / 4000 = 75 // CPU Score: (3000 *100) / 4000 = 75
@ -238,69 +185,105 @@ func TestNodeResourcesMostAllocated(t *testing.T) {
// CPU Score: (3000 *100) / 6000 = 50 // CPU Score: (3000 *100) / 6000 = 50
// Memory Score: (5000 *100) / 10000 = 50 // Memory Score: (5000 *100) / 10000 = 50
// Node2 Score: (50 * 1 + 50 * 2) / (1 + 2) = 50 // Node2 Score: (50 * 1 + 50 * 2) / (1 + 2) = 50
pod: &v1.Pod{Spec: cpuAndMemory}, name: "nothing scheduled, resources requested, differently sized machines",
nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)}, requestedPod: st.MakePod().
args: config.NodeResourcesMostAllocatedArgs{Resources: []config.ResourceSpec{{Name: "memory", Weight: 2}, {Name: "cpu", Weight: 1}}}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
expectedList: []framework.NodeScore{{Name: "machine1", Score: 58}, {Name: "machine2", Score: 50}}, Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
name: "nothing scheduled, resources requested, differently sized machines", Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: 58}, {Name: "node2", Score: 50}},
resources: []config.ResourceSpec{
{Name: "memory", Weight: 2},
{Name: "cpu", Weight: 1},
},
}, },
{ {
// Node1 scores on 0-MaxNodeScore scale // Node1 scores on 0-MaxNodeScore scale
// CPU Fraction: 300 / 250 = 100% // CPU Fraction: 300 / 250 = 100%
// Memory Fraction: 600 / 10000 = 60% // Memory Fraction: 600 / 1000 = 60%
// Node1 Score: (100 + 60) / 2 = 80 // Node1 Score: (100 + 60) / 2 = 80
// Node2 scores on 0-MaxNodeScore scale // Node2 scores on 0-MaxNodeScore scale
// CPU Fraction: 100 / 250 = 40% // CPU Fraction: 100 / 250 = 40%
// Memory Fraction: 200 / 10000 = 20% // Memory Fraction: 200 / 1000 = 20%
// Node2 Score: (20 + 40) / 2 = 30 // Node2 Score: (20 + 40) / 2 = 30
pod: &v1.Pod{Spec: nonZeroContainer}, name: "no resources requested, pods scheduled, nonzero request for resource",
nodes: []*v1.Node{makeNode("machine1", 250, 1000*1024*1024), makeNode("machine2", 250, 1000*1024*1024)}, requestedPod: st.MakePod().Container("container").Obj(),
args: config.NodeResourcesMostAllocatedArgs{Resources: []config.ResourceSpec{{Name: "memory", Weight: 1}, {Name: "cpu", Weight: 1}}}, nodes: []*v1.Node{
expectedList: []framework.NodeScore{{Name: "machine1", Score: 80}, {Name: "machine2", Score: 30}}, st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "250m", "memory": "1000Mi"}).Obj(),
name: "no resources requested, pods scheduled", st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "250m", "memory": "1000Mi"}).Obj(),
pods: []*v1.Pod{
{Spec: nonZeroContainer1},
{Spec: nonZeroContainer1},
}, },
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Container("container").Obj(),
st.MakePod().Node("node1").Container("container").Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: 80}, {Name: "node2", Score: 30}},
resources: defaultResources,
}, },
{ {
// resource with negtive weight is not allowed // resource with negtive weight is not allowed
pod: &v1.Pod{Spec: cpuAndMemory}, name: "resource with negtive weight",
nodes: []*v1.Node{makeNode("machine", 4000, 10000)}, requestedPod: st.MakePod().
args: config.NodeResourcesMostAllocatedArgs{Resources: []config.ResourceSpec{{Name: "memory", Weight: -1}, {Name: "cpu", Weight: 1}}}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
wantErr: field.ErrorList{ Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
},
resources: []config.ResourceSpec{
{Name: "memory", Weight: -1},
{Name: "cpu", Weight: 1},
},
wantErrs: field.ErrorList{
&field.Error{ &field.Error{
Type: field.ErrorTypeInvalid, Type: field.ErrorTypeInvalid,
Field: "resources[0].weight", Field: "resources[0].weight",
}, },
}.ToAggregate(), },
name: "resource with negtive weight",
}, },
{ {
// resource with zero weight is not allowed // resource with zero weight is not allowed
pod: &v1.Pod{Spec: cpuAndMemory}, name: "resource with zero weight",
nodes: []*v1.Node{makeNode("machine", 4000, 10000)}, requestedPod: st.MakePod().
args: config.NodeResourcesMostAllocatedArgs{Resources: []config.ResourceSpec{{Name: "memory", Weight: 1}, {Name: "cpu", Weight: 0}}}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
wantErr: field.ErrorList{ Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
},
resources: []config.ResourceSpec{
{Name: "memory", Weight: 1},
{Name: "cpu", Weight: 0},
},
wantErrs: field.ErrorList{
&field.Error{ &field.Error{
Type: field.ErrorTypeInvalid, Type: field.ErrorTypeInvalid,
Field: "resources[1].weight", Field: "resources[1].weight",
}, },
}.ToAggregate(), },
name: "resource with zero weight",
}, },
{ {
// resource weight should be less than MaxNodeScore // resource weight should be less than MaxNodeScore
pod: &v1.Pod{Spec: cpuAndMemory}, name: "resource weight larger than MaxNodeScore",
nodes: []*v1.Node{makeNode("machine", 4000, 10000)}, requestedPod: st.MakePod().
args: config.NodeResourcesMostAllocatedArgs{Resources: []config.ResourceSpec{{Name: "memory", Weight: 120}}}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
wantErr: field.ErrorList{ Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
},
resources: []config.ResourceSpec{
{Name: "memory", Weight: 101},
},
wantErrs: field.ErrorList{
&field.Error{ &field.Error{
Type: field.ErrorTypeInvalid, Type: field.ErrorTypeInvalid,
Field: "resources[0].weight", Field: "resources[0].weight",
}, },
}.ToAggregate(), },
name: "resource weight larger than MaxNodeScore",
}, },
{ {
// Bypass extended resource if the pod does not request. // Bypass extended resource if the pod does not request.
@ -309,14 +292,18 @@ func TestNodeResourcesMostAllocated(t *testing.T) {
// the final scores are: // the final scores are:
// - node1: (50 + 50) / 2 = 50 // - node1: (50 + 50) / 2 = 50
// - node2: (50 + 50) / 2 = 50 // - node2: (50 + 50) / 2 = 50
pod: &v1.Pod{Spec: cpuAndMemory}, name: "bypass extended resource if the pod does not request",
requestedPod: st.MakePod().
Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
Obj(),
nodes: []*v1.Node{ nodes: []*v1.Node{
makeNode("machine1", 6000, 10000), st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
makeNodeWithExtendedResource("machine2", 6000, 10000, map[string]int64{extendedRes: 4}), st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000", v1.ResourceName(extendedRes): "4"}).Obj(),
}, },
args: config.NodeResourcesMostAllocatedArgs{Resources: extendedResourceMostAllocatedSet}, resources: extendedResourceLeastAllocatedSet,
expectedList: []framework.NodeScore{{Name: "machine1", Score: 50}, {Name: "machine2", Score: 50}}, existingPods: nil,
name: "bypass extended resource if the pod does not request", expectedScores: []framework.NodeScore{{Name: "node1", Score: 50}, {Name: "node2", Score: 50}},
}, },
{ {
// Honor extended resource if the pod requests. // Honor extended resource if the pod requests.
@ -327,47 +314,52 @@ func TestNodeResourcesMostAllocated(t *testing.T) {
// So the final scores are: // So the final scores are:
// - node1: (50 + 50 + 50) / 3 = 50 // - node1: (50 + 50 + 50) / 3 = 50
// - node2: (50 + 50 + 20) / 3 = 40 // - node2: (50 + 50 + 20) / 3 = 40
pod: &v1.Pod{Spec: cpuMemoryAndExtendedRes}, name: "honor extended resource if the pod request",
requestedPod: st.MakePod().Node("node1").
Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000", v1.ResourceName(extendedRes): "2"}).
Obj(),
nodes: []*v1.Node{ nodes: []*v1.Node{
makeNodeWithExtendedResource("machine1", 6000, 10000, map[string]int64{extendedRes: 4}), st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000", v1.ResourceName(extendedRes): "4"}).Obj(),
makeNodeWithExtendedResource("machine2", 6000, 10000, map[string]int64{extendedRes: 10}), st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000", v1.ResourceName(extendedRes): "10"}).Obj(),
}, },
args: config.NodeResourcesMostAllocatedArgs{Resources: extendedResourceMostAllocatedSet}, resources: extendedResourceLeastAllocatedSet,
expectedList: []framework.NodeScore{{Name: "machine1", Score: 50}, {Name: "machine2", Score: 40}}, existingPods: nil,
name: "honor extended resource if the pod requests", expectedScores: []framework.NodeScore{{Name: "node1", Score: 50}, {Name: "node2", Score: 40}},
}, },
} }
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
snapshot := cache.NewSnapshot(test.pods, test.nodes) state := framework.NewCycleState()
snapshot := cache.NewSnapshot(test.existingPods, test.nodes)
fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot)) fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot))
p, err := NewMostAllocated(&test.args, fh, feature.Features{EnablePodOverhead: true})
if test.wantErr != nil { p, err := NewFit(
if err != nil { &config.NodeResourcesFitArgs{
diff := cmp.Diff(test.wantErr, err, cmpopts.IgnoreFields(field.Error{}, "BadValue", "Detail")) ScoringStrategy: &config.ScoringStrategy{
if diff != "" { Type: config.MostAllocated,
t.Fatalf("got err (-want,+got):\n%s", diff) Resources: test.resources,
} },
} else { }, fh, plfeature.Features{EnablePodOverhead: true})
t.Fatalf("no error produced, wanted %v", test.wantErr)
} if diff := cmp.Diff(test.wantErrs.ToAggregate(), err, ignoreBadValueDetail); diff != "" {
t.Fatalf("got err (-want,+got):\n%s", diff)
}
if err != nil {
return return
} }
if err != nil && test.wantErr == nil { var gotScores framework.NodeScoreList
t.Fatalf("failed to initialize plugin NodeResourcesMostAllocated, got error: %v", err) for _, n := range test.nodes {
score, status := p.(framework.ScorePlugin).Score(context.Background(), state, test.requestedPod, n.Name)
if !status.IsSuccess() {
t.Errorf("unexpected error: %v", status)
}
gotScores = append(gotScores, framework.NodeScore{Name: n.Name, Score: score})
} }
for i := range test.nodes { if diff := cmp.Diff(test.expectedScores, gotScores); diff != "" {
hostResult, err := p.(framework.ScorePlugin).Score(context.Background(), nil, test.pod, test.nodes[i].Name) t.Errorf("Unexpected scores (-want,+got):\n%s", diff)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
if !reflect.DeepEqual(test.expectedList[i].Score, hostResult) {
t.Errorf("got score %v for host %v, expected %v", hostResult, test.nodes[i].Name, test.expectedList[i].Score)
}
} }
}) })
} }

71
pkg/scheduler/framework/plugins/noderesources/requested_to_capacity_ratio.go
View File

@ -17,86 +17,19 @@ limitations under the License.
package noderesources package noderesources
import ( import (
"context"
"fmt"
"math" "math"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/apis/config/validation"
"k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/names"
) )
const ( const (
// RequestedToCapacityRatioName is the name of this plugin. maxUtilization = 100
RequestedToCapacityRatioName = names.RequestedToCapacityRatio
maxUtilization = 100
) )
// NewRequestedToCapacityRatio initializes a new plugin and returns it. // buildRequestedToCapacityRatioScorerFunction allows users to apply bin packing
func NewRequestedToCapacityRatio(plArgs runtime.Object, handle framework.Handle, fts feature.Features) (framework.Plugin, error) {
args, err := getRequestedToCapacityRatioArgs(plArgs)
if err != nil {
return nil, err
}
if err := validation.ValidateRequestedToCapacityRatioArgs(nil, &args); err != nil {
return nil, err
}
resourceToWeightMap := resourcesToWeightMap(args.Resources)
return &RequestedToCapacityRatio{
handle: handle,
resourceAllocationScorer: resourceAllocationScorer{
Name: RequestedToCapacityRatioName,
scorer: requestedToCapacityRatioScorer(resourceToWeightMap, args.Shape),
resourceToWeightMap: resourceToWeightMap,
enablePodOverhead: fts.EnablePodOverhead,
},
}, nil
}
func getRequestedToCapacityRatioArgs(obj runtime.Object) (config.RequestedToCapacityRatioArgs, error) {
ptr, ok := obj.(*config.RequestedToCapacityRatioArgs)
if !ok {
return config.RequestedToCapacityRatioArgs{}, fmt.Errorf("want args to be of type RequestedToCapacityRatioArgs, got %T", obj)
}
return *ptr, nil
}
// RequestedToCapacityRatio is a score plugin that allow users to apply bin packing
// on core resources like CPU, Memory as well as extended resources like accelerators. // on core resources like CPU, Memory as well as extended resources like accelerators.
type RequestedToCapacityRatio struct {
handle framework.Handle
resourceAllocationScorer
}
var _ framework.ScorePlugin = &RequestedToCapacityRatio{}
// Name returns name of the plugin. It is used in logs, etc.
func (pl *RequestedToCapacityRatio) Name() string {
return RequestedToCapacityRatioName
}
// Score invoked at the score extension point.
func (pl *RequestedToCapacityRatio) Score(ctx context.Context, _ *framework.CycleState, pod *v1.Pod, nodeName string) (int64, *framework.Status) {
nodeInfo, err := pl.handle.SnapshotSharedLister().NodeInfos().Get(nodeName)
if err != nil {
return 0, framework.AsStatus(fmt.Errorf("getting node %q from Snapshot: %w", nodeName, err))
}
return pl.score(pod, nodeInfo)
}
// ScoreExtensions of the Score plugin.
func (pl *RequestedToCapacityRatio) ScoreExtensions() framework.ScoreExtensions {
return nil
}
func buildRequestedToCapacityRatioScorerFunction(scoringFunctionShape helper.FunctionShape, resourceToWeightMap resourceToWeightMap) func(resourceToValueMap, resourceToValueMap) int64 { func buildRequestedToCapacityRatioScorerFunction(scoringFunctionShape helper.FunctionShape, resourceToWeightMap resourceToWeightMap) func(resourceToValueMap, resourceToValueMap) int64 {
rawScoringFunction := helper.BuildBrokenLinearFunction(scoringFunctionShape) rawScoringFunction := helper.BuildBrokenLinearFunction(scoringFunctionShape)
resourceScoringFunction := func(requested, capacity int64) int64 { resourceScoringFunction := func(requested, capacity int64) int64 {

296
pkg/scheduler/framework/plugins/noderesources/requested_to_capacity_ratio_test.go
View File

@ -19,107 +19,133 @@ package noderesources
import ( import (
"context" "context"
"fmt" "fmt"
"reflect"
"testing" "testing"
"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
plfeature "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper"
"k8s.io/kubernetes/pkg/scheduler/framework/runtime" "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
"k8s.io/kubernetes/pkg/scheduler/internal/cache" "k8s.io/kubernetes/pkg/scheduler/internal/cache"
st "k8s.io/kubernetes/pkg/scheduler/testing"
) )
func TestRequestedToCapacityRatio(t *testing.T) { func TestRequestedToCapacityRatioScoringStrategy(t *testing.T) {
type test struct { defaultResources := []config.ResourceSpec{
name string {Name: string(v1.ResourceCPU), Weight: 1},
requestedPod *v1.Pod {Name: string(v1.ResourceMemory), Weight: 1},
nodes []*v1.Node
scheduledPods []*v1.Pod
expectedPriorities framework.NodeScoreList
} }
tests := []test{ shape := []config.UtilizationShapePoint{
{Utilization: 0, Score: 10},
{Utilization: 100, Score: 0},
}
tests := []struct {
name string
requestedPod *v1.Pod
nodes []*v1.Node
existingPods []*v1.Pod
expectedScores framework.NodeScoreList
resources []config.ResourceSpec
shape []config.UtilizationShapePoint
wantErrs field.ErrorList
}{
{ {
name: "nothing scheduled, nothing requested (default - least requested nodes have priority)", name: "nothing scheduled, nothing requested (default - least requested nodes have priority)",
requestedPod: makePod("", 0, 0), requestedPod: st.MakePod().Obj(),
nodes: []*v1.Node{makeNode("node1", 4000, 10000), makeNode("node2", 4000, 10000)}, nodes: []*v1.Node{
scheduledPods: []*v1.Pod{makePod("node1", 0, 0), makePod("node2", 0, 0)}, st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
expectedPriorities: []framework.NodeScore{{Name: "node1", Score: 100}, {Name: "node2", Score: 100}}, st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
},
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Obj(),
st.MakePod().Node("node1").Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: framework.MaxNodeScore}, {Name: "node2", Score: framework.MaxNodeScore}},
resources: defaultResources,
shape: shape,
}, },
{ {
name: "nothing scheduled, resources requested, differently sized machines (default - least requested nodes have priority)", name: "nothing scheduled, resources requested, differently sized machines (default - least requested nodes have priority)",
requestedPod: makePod("", 3000, 5000), requestedPod: st.MakePod().
nodes: []*v1.Node{makeNode("node1", 4000, 10000), makeNode("node2", 6000, 10000)}, Req(map[v1.ResourceName]string{"cpu": "1000", "memory": "2000"}).
scheduledPods: []*v1.Pod{makePod("node1", 0, 0), makePod("node2", 0, 0)}, Req(map[v1.ResourceName]string{"cpu": "2000", "memory": "3000"}).
expectedPriorities: []framework.NodeScore{{Name: "node1", Score: 38}, {Name: "node2", Score: 50}}, Obj(),
nodes: []*v1.Node{
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Obj(),
st.MakePod().Node("node1").Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: 38}, {Name: "node2", Score: 50}},
resources: defaultResources,
shape: shape,
}, },
{ {
name: "no resources requested, pods scheduled with resources (default - least requested nodes have priority)", name: "no resources requested, pods scheduled with resources (default - least requested nodes have priority)",
requestedPod: makePod("", 0, 0), requestedPod: st.MakePod().Obj(),
nodes: []*v1.Node{makeNode("node1", 4000, 10000), makeNode("node2", 6000, 10000)}, nodes: []*v1.Node{
scheduledPods: []*v1.Pod{makePod("node1", 3000, 5000), makePod("node2", 3000, 5000)}, st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "4000", "memory": "10000"}).Obj(),
expectedPriorities: []framework.NodeScore{{Name: "node1", Score: 38}, {Name: "node2", Score: 50}}, st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
},
existingPods: []*v1.Pod{
st.MakePod().Node("node1").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).Obj(),
st.MakePod().Node("node2").Req(map[v1.ResourceName]string{"cpu": "3000", "memory": "5000"}).Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: 38}, {Name: "node2", Score: 50}},
resources: defaultResources,
shape: shape,
}, },
} }
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
state := framework.NewCycleState() state := framework.NewCycleState()
snapshot := cache.NewSnapshot(test.scheduledPods, test.nodes) snapshot := cache.NewSnapshot(test.existingPods, test.nodes)
fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot)) fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot))
args := config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{ p, err := NewFit(&config.NodeResourcesFitArgs{
{Utilization: 0, Score: 10}, ScoringStrategy: &config.ScoringStrategy{
{Utilization: 100, Score: 0}, Type: config.RequestedToCapacityRatio,
}, Resources: test.resources,
Resources: []config.ResourceSpec{ RequestedToCapacityRatio: &config.RequestedToCapacityRatioParam{
{Name: "memory", Weight: 1}, Shape: shape,
{Name: "cpu", Weight: 1}, },
}, },
}, fh, plfeature.Features{EnablePodOverhead: true})
if diff := cmp.Diff(test.wantErrs.ToAggregate(), err, ignoreBadValueDetail); diff != "" {
t.Fatalf("got err (-want,+got):\n%s", diff)
} }
p, err := NewRequestedToCapacityRatio(&args, fh, feature.Features{EnablePodOverhead: true})
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) return
} }
var gotPriorities framework.NodeScoreList var gotScores framework.NodeScoreList
for _, n := range test.nodes { for _, n := range test.nodes {
score, status := p.(framework.ScorePlugin).Score(context.Background(), state, test.requestedPod, n.Name) score, status := p.(framework.ScorePlugin).Score(context.Background(), state, test.requestedPod, n.Name)
if !status.IsSuccess() { if !status.IsSuccess() {
t.Errorf("unexpected error: %v", status) t.Errorf("unexpected error: %v", status)
} }
gotPriorities = append(gotPriorities, framework.NodeScore{Name: n.Name, Score: score}) gotScores = append(gotScores, framework.NodeScore{Name: n.Name, Score: score})
} }
if !reflect.DeepEqual(test.expectedPriorities, gotPriorities) { if diff := cmp.Diff(test.expectedScores, gotScores); diff != "" {
t.Errorf("expected:\n\t%+v,\ngot:\n\t%+v", test.expectedPriorities, gotPriorities) t.Errorf("Unexpected nodes (-want,+got):\n%s", diff)
} }
}) })
} }
} }
func makePod(node string, milliCPU, memory int64) *v1.Pod {
return &v1.Pod{
Spec: v1.PodSpec{
NodeName: node,
Containers: []v1.Container{
{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(milliCPU, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(memory, resource.DecimalSI),
},
},
},
},
},
}
}
func TestBrokenLinearFunction(t *testing.T) { func TestBrokenLinearFunction(t *testing.T) {
type Assertion struct { type Assertion struct {
p int64 p int64
@ -195,9 +221,6 @@ func TestResourceBinPackingSingleExtended(t *testing.T) {
"intel.com/foo": 8, "intel.com/foo": 8,
} }
noResources := v1.PodSpec{
Containers: []v1.Container{},
}
extendedResourcePod1 := v1.PodSpec{ extendedResourcePod1 := v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
{ {
@ -223,18 +246,18 @@ func TestResourceBinPackingSingleExtended(t *testing.T) {
machine2Pod := extendedResourcePod1 machine2Pod := extendedResourcePod1
machine2Pod.NodeName = "machine2" machine2Pod.NodeName = "machine2"
tests := []struct { tests := []struct {
pod *v1.Pod pod *v1.Pod
pods []*v1.Pod pods []*v1.Pod
nodes []*v1.Node nodes []*v1.Node
expectedList framework.NodeScoreList expectedScores framework.NodeScoreList
name string name string
}{ }{
{ {
// Node1 Score = Node2 Score = 0 as the incoming Pod doesn't request extended resource. // Node1 Score = Node2 Score = 0 as the incoming Pod doesn't request extended resource.
pod: &v1.Pod{Spec: noResources}, pod: st.MakePod().Obj(),
nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResource2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResource1)}, nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResource2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResource1)},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 0}, {Name: "machine2", Score: 0}}, expectedScores: []framework.NodeScore{{Name: "machine1", Score: 0}, {Name: "machine2", Score: 0}},
name: "nothing scheduled, nothing requested", name: "nothing scheduled, nothing requested",
}, },
{ {
// Node1 scores (used resources) on 0-MaxNodeScore scale // Node1 scores (used resources) on 0-MaxNodeScore scale
@ -248,12 +271,12 @@ func TestResourceBinPackingSingleExtended(t *testing.T) {
// resourceScoringFunction((0+2),4) // resourceScoringFunction((0+2),4)
// = 2/4 * maxUtilization = 50 = rawScoringFunction(50) // = 2/4 * maxUtilization = 50 = rawScoringFunction(50)
// Node2 Score: 5 // Node2 Score: 5
pod: &v1.Pod{Spec: extendedResourcePod1}, pod: &v1.Pod{Spec: extendedResourcePod1},
nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResource2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResource1)}, nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResource2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResource1)},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 2}, {Name: "machine2", Score: 5}}, expectedScores: []framework.NodeScore{{Name: "machine1", Score: 2}, {Name: "machine2", Score: 5}},
name: "resources requested, pods scheduled with less resources", name: "resources requested, pods scheduled with less resources",
pods: []*v1.Pod{ pods: []*v1.Pod{
{Spec: noResources}, st.MakePod().Obj(),
}, },
}, },
{ {
@ -268,10 +291,10 @@ func TestResourceBinPackingSingleExtended(t *testing.T) {
// resourceScoringFunction((2+2),4) // resourceScoringFunction((2+2),4)
// = 4/4 * maxUtilization = maxUtilization = rawScoringFunction(maxUtilization) // = 4/4 * maxUtilization = maxUtilization = rawScoringFunction(maxUtilization)
// Node2 Score: 10 // Node2 Score: 10
pod: &v1.Pod{Spec: extendedResourcePod1}, pod: &v1.Pod{Spec: extendedResourcePod1},
nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResource2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResource1)}, nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResource2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResource1)},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 2}, {Name: "machine2", Score: 10}}, expectedScores: []framework.NodeScore{{Name: "machine1", Score: 2}, {Name: "machine2", Score: 10}},
name: "resources requested, pods scheduled with resources, on node with existing pod running ", name: "resources requested, pods scheduled with resources, on node with existing pod running ",
pods: []*v1.Pod{ pods: []*v1.Pod{
{Spec: machine2Pod}, {Spec: machine2Pod},
}, },
@ -288,12 +311,12 @@ func TestResourceBinPackingSingleExtended(t *testing.T) {
// resourceScoringFunction((0+4),4) // resourceScoringFunction((0+4),4)
// = 4/4 * maxUtilization = maxUtilization = rawScoringFunction(maxUtilization) // = 4/4 * maxUtilization = maxUtilization = rawScoringFunction(maxUtilization)
// Node2 Score: 10 // Node2 Score: 10
pod: &v1.Pod{Spec: extendedResourcePod2}, pod: &v1.Pod{Spec: extendedResourcePod2},
nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResource2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResource1)}, nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResource2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResource1)},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 5}, {Name: "machine2", Score: 10}}, expectedScores: []framework.NodeScore{{Name: "machine1", Score: 5}, {Name: "machine2", Score: 10}},
name: "resources requested, pods scheduled with more resources", name: "resources requested, pods scheduled with more resources",
pods: []*v1.Pod{ pods: []*v1.Pod{
{Spec: noResources}, st.MakePod().Obj(),
}, },
}, },
} }
@ -303,16 +326,21 @@ func TestResourceBinPackingSingleExtended(t *testing.T) {
state := framework.NewCycleState() state := framework.NewCycleState()
snapshot := cache.NewSnapshot(test.pods, test.nodes) snapshot := cache.NewSnapshot(test.pods, test.nodes)
fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot)) fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot))
args := config.RequestedToCapacityRatioArgs{ args := config.NodeResourcesFitArgs{
Shape: []config.UtilizationShapePoint{ ScoringStrategy: &config.ScoringStrategy{
{Utilization: 0, Score: 0}, Type: config.RequestedToCapacityRatio,
{Utilization: 100, Score: 1}, Resources: []config.ResourceSpec{
}, {Name: "intel.com/foo", Weight: 1},
Resources: []config.ResourceSpec{ },
{Name: "intel.com/foo", Weight: 1}, RequestedToCapacityRatio: &config.RequestedToCapacityRatioParam{
Shape: []config.UtilizationShapePoint{
{Utilization: 0, Score: 0},
{Utilization: 100, Score: 1},
},
},
}, },
} }
p, err := NewRequestedToCapacityRatio(&args, fh, feature.Features{EnablePodOverhead: true}) p, err := NewFit(&args, fh, feature.Features{EnablePodOverhead: true})
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
@ -326,8 +354,8 @@ func TestResourceBinPackingSingleExtended(t *testing.T) {
gotList = append(gotList, framework.NodeScore{Name: n.Name, Score: score}) gotList = append(gotList, framework.NodeScore{Name: n.Name, Score: score})
} }
if !reflect.DeepEqual(test.expectedList, gotList) { if diff := cmp.Diff(test.expectedScores, gotList); diff != "" {
t.Errorf("expected %#v, got %#v", test.expectedList, gotList) t.Errorf("Unexpected nodescore list (-want,+got):\n%s", diff)
} }
}) })
} }
@ -346,9 +374,6 @@ func TestResourceBinPackingMultipleExtended(t *testing.T) {
"intel.com/bar": 4, "intel.com/bar": 4,
} }
noResources := v1.PodSpec{
Containers: []v1.Container{},
}
extnededResourcePod1 := v1.PodSpec{ extnededResourcePod1 := v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
{ {
@ -376,11 +401,11 @@ func TestResourceBinPackingMultipleExtended(t *testing.T) {
machine2Pod := extnededResourcePod1 machine2Pod := extnededResourcePod1
machine2Pod.NodeName = "machine2" machine2Pod.NodeName = "machine2"
tests := []struct { tests := []struct {
pod *v1.Pod pod *v1.Pod
pods []*v1.Pod pods []*v1.Pod
nodes []*v1.Node nodes []*v1.Node
expectedList framework.NodeScoreList expectedScores framework.NodeScoreList
name string name string
}{ }{
{ {
@ -410,10 +435,10 @@ func TestResourceBinPackingMultipleExtended(t *testing.T) {
// = 0/8 * 100 = 0 = rawScoringFunction(0) // = 0/8 * 100 = 0 = rawScoringFunction(0)
// Node2 Score: (0 * 3) + (0 * 5) / 8 = 0 // Node2 Score: (0 * 3) + (0 * 5) / 8 = 0
pod: &v1.Pod{Spec: noResources}, pod: st.MakePod().Obj(),
nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResources2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResources1)}, nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResources2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResources1)},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 0}, {Name: "machine2", Score: 0}}, expectedScores: []framework.NodeScore{{Name: "machine1", Score: 0}, {Name: "machine2", Score: 0}},
name: "nothing scheduled, nothing requested", name: "nothing scheduled, nothing requested",
}, },
{ {
@ -444,12 +469,12 @@ func TestResourceBinPackingMultipleExtended(t *testing.T) {
// = 2/8 * 100 = 25 = rawScoringFunction(25) // = 2/8 * 100 = 25 = rawScoringFunction(25)
// Node2 Score: (5 * 3) + (2 * 5) / 8 = 3 // Node2 Score: (5 * 3) + (2 * 5) / 8 = 3
pod: &v1.Pod{Spec: extnededResourcePod1}, pod: &v1.Pod{Spec: extnededResourcePod1},
nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResources2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResources1)}, nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResources2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResources1)},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 4}, {Name: "machine2", Score: 3}}, expectedScores: []framework.NodeScore{{Name: "machine1", Score: 4}, {Name: "machine2", Score: 3}},
name: "resources requested, pods scheduled with less resources", name: "resources requested, pods scheduled with less resources",
pods: []*v1.Pod{ pods: []*v1.Pod{
{Spec: noResources}, st.MakePod().Obj(),
}, },
}, },
@ -480,10 +505,10 @@ func TestResourceBinPackingMultipleExtended(t *testing.T) {
// = 4/8 *100 = 50 = rawScoringFunction(50) // = 4/8 *100 = 50 = rawScoringFunction(50)
// Node2 Score: (10 * 3) + (5 * 5) / 8 = 7 // Node2 Score: (10 * 3) + (5 * 5) / 8 = 7
pod: &v1.Pod{Spec: extnededResourcePod1}, pod: &v1.Pod{Spec: extnededResourcePod1},
nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResources2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResources1)}, nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResources2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResources1)},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 4}, {Name: "machine2", Score: 7}}, expectedScores: []framework.NodeScore{{Name: "machine1", Score: 4}, {Name: "machine2", Score: 7}},
name: "resources requested, pods scheduled with resources, on node with existing pod running ", name: "resources requested, pods scheduled with resources, on node with existing pod running ",
pods: []*v1.Pod{ pods: []*v1.Pod{
{Spec: machine2Pod}, {Spec: machine2Pod},
}, },
@ -531,12 +556,12 @@ func TestResourceBinPackingMultipleExtended(t *testing.T) {
// = 2/8 * 100 = 25 = rawScoringFunction(25) // = 2/8 * 100 = 25 = rawScoringFunction(25)
// Node2 Score: (10 * 3) + (2 * 5) / 8 = 5 // Node2 Score: (10 * 3) + (2 * 5) / 8 = 5
pod: &v1.Pod{Spec: extnededResourcePod2}, pod: &v1.Pod{Spec: extnededResourcePod2},
nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResources2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResources1)}, nodes: []*v1.Node{makeNodeWithExtendedResource("machine1", 4000, 10000*1024*1024, extendedResources2), makeNodeWithExtendedResource("machine2", 4000, 10000*1024*1024, extendedResources1)},
expectedList: []framework.NodeScore{{Name: "machine1", Score: 5}, {Name: "machine2", Score: 5}}, expectedScores: []framework.NodeScore{{Name: "machine1", Score: 5}, {Name: "machine2", Score: 5}},
name: "resources requested, pods scheduled with more resources", name: "resources requested, pods scheduled with more resources",
pods: []*v1.Pod{ pods: []*v1.Pod{
{Spec: noResources}, st.MakePod().Obj(),
}, },
}, },
} }
@ -546,32 +571,39 @@ func TestResourceBinPackingMultipleExtended(t *testing.T) {
state := framework.NewCycleState() state := framework.NewCycleState()
snapshot := cache.NewSnapshot(test.pods, test.nodes) snapshot := cache.NewSnapshot(test.pods, test.nodes)
fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot)) fh, _ := runtime.NewFramework(nil, nil, runtime.WithSnapshotSharedLister(snapshot))
args := config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{ args := config.NodeResourcesFitArgs{
{Utilization: 0, Score: 0}, ScoringStrategy: &config.ScoringStrategy{
{Utilization: 100, Score: 1}, Type: config.RequestedToCapacityRatio,
}, Resources: []config.ResourceSpec{
Resources: []config.ResourceSpec{ {Name: "intel.com/foo", Weight: 3},
{Name: "intel.com/foo", Weight: 3}, {Name: "intel.com/bar", Weight: 5},
{Name: "intel.com/bar", Weight: 5}, },
RequestedToCapacityRatio: &config.RequestedToCapacityRatioParam{
Shape: []config.UtilizationShapePoint{
{Utilization: 0, Score: 0},
{Utilization: 100, Score: 1},
},
},
}, },
} }
p, err := NewRequestedToCapacityRatio(&args, fh, feature.Features{EnablePodOverhead: true})
p, err := NewFit(&args, fh, feature.Features{EnablePodOverhead: true})
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
var gotList framework.NodeScoreList var gotScores framework.NodeScoreList
for _, n := range test.nodes { for _, n := range test.nodes {
score, status := p.(framework.ScorePlugin).Score(context.Background(), state, test.pod, n.Name) score, status := p.(framework.ScorePlugin).Score(context.Background(), state, test.pod, n.Name)
if !status.IsSuccess() { if !status.IsSuccess() {
t.Errorf("unexpected error: %v", status) t.Errorf("unexpected error: %v", status)
} }
gotList = append(gotList, framework.NodeScore{Name: n.Name, Score: score}) gotScores = append(gotScores, framework.NodeScore{Name: n.Name, Score: score})
} }
if !reflect.DeepEqual(test.expectedList, gotList) { if diff := cmp.Diff(test.expectedScores, gotScores); diff != "" {
t.Errorf("expected %#v, got %#v", test.expectedList, gotList) t.Errorf("Unexpected nodescore list (-want,+got):\n%s", diff)
} }
}) })
} }

6
pkg/scheduler/framework/plugins/noderesources/test_util.go
View File

@ -17,9 +17,15 @@ limitations under the License.
package noderesources package noderesources
import ( import (
"github.com/google/go-cmp/cmp/cmpopts"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/validation/field"
)
var (
ignoreBadValueDetail = cmpopts.IgnoreFields(field.Error{}, "BadValue", "Detail")
) )
func makeNode(node string, milliCPU, memory int64) *v1.Node { func makeNode(node string, milliCPU, memory int64) *v1.Node {

47
pkg/scheduler/framework/plugins/registry.go
View File

@ -54,30 +54,27 @@ func NewInTreeRegistry() runtime.Registry {
} }
return runtime.Registry{ return runtime.Registry{
selectorspread.Name: selectorspread.New, selectorspread.Name: selectorspread.New,
imagelocality.Name: imagelocality.New, imagelocality.Name: imagelocality.New,
tainttoleration.Name: tainttoleration.New, tainttoleration.Name: tainttoleration.New,
nodename.Name: nodename.New, nodename.Name: nodename.New,
nodeports.Name: nodeports.New, nodeports.Name: nodeports.New,
nodeaffinity.Name: nodeaffinity.New, nodeaffinity.Name: nodeaffinity.New,
podtopologyspread.Name: podtopologyspread.New, podtopologyspread.Name: podtopologyspread.New,
nodeunschedulable.Name: nodeunschedulable.New, nodeunschedulable.Name: nodeunschedulable.New,
noderesources.FitName: runtime.FactoryAdapter(fts, noderesources.NewFit), noderesources.FitName: runtime.FactoryAdapter(fts, noderesources.NewFit),
noderesources.BalancedAllocationName: runtime.FactoryAdapter(fts, noderesources.NewBalancedAllocation), noderesources.BalancedAllocationName: runtime.FactoryAdapter(fts, noderesources.NewBalancedAllocation),
noderesources.MostAllocatedName: runtime.FactoryAdapter(fts, noderesources.NewMostAllocated), volumebinding.Name: runtime.FactoryAdapter(fts, volumebinding.New),
noderesources.LeastAllocatedName: runtime.FactoryAdapter(fts, noderesources.NewLeastAllocated), volumerestrictions.Name: runtime.FactoryAdapter(fts, volumerestrictions.New),
noderesources.RequestedToCapacityRatioName: runtime.FactoryAdapter(fts, noderesources.NewRequestedToCapacityRatio), volumezone.Name: volumezone.New,
volumebinding.Name: runtime.FactoryAdapter(fts, volumebinding.New), nodevolumelimits.CSIName: runtime.FactoryAdapter(fts, nodevolumelimits.NewCSI),
volumerestrictions.Name: runtime.FactoryAdapter(fts, volumerestrictions.New), nodevolumelimits.EBSName: runtime.FactoryAdapter(fts, nodevolumelimits.NewEBS),
volumezone.Name: volumezone.New, nodevolumelimits.GCEPDName: runtime.FactoryAdapter(fts, nodevolumelimits.NewGCEPD),
nodevolumelimits.CSIName: runtime.FactoryAdapter(fts, nodevolumelimits.NewCSI), nodevolumelimits.AzureDiskName: runtime.FactoryAdapter(fts, nodevolumelimits.NewAzureDisk),
nodevolumelimits.EBSName: runtime.FactoryAdapter(fts, nodevolumelimits.NewEBS), nodevolumelimits.CinderName: runtime.FactoryAdapter(fts, nodevolumelimits.NewCinder),
nodevolumelimits.GCEPDName: runtime.FactoryAdapter(fts, nodevolumelimits.NewGCEPD), interpodaffinity.Name: runtime.FactoryAdapter(fts, interpodaffinity.New),
nodevolumelimits.AzureDiskName: runtime.FactoryAdapter(fts, nodevolumelimits.NewAzureDisk), queuesort.Name: queuesort.New,
nodevolumelimits.CinderName: runtime.FactoryAdapter(fts, nodevolumelimits.NewCinder), defaultbinder.Name: defaultbinder.New,
interpodaffinity.Name: runtime.FactoryAdapter(fts, interpodaffinity.New), defaultpreemption.Name: runtime.FactoryAdapter(fts, defaultpreemption.New),
queuesort.Name: queuesort.New,
defaultbinder.Name: defaultbinder.New,
defaultpreemption.Name: runtime.FactoryAdapter(fts, defaultpreemption.New),
} }
} }

2
pkg/scheduler/testing/wrappers.go
View File

@ -19,7 +19,7 @@ package testing
import ( import (
"fmt" "fmt"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"

1
test/e2e/framework/.import-restrictions
View File

@ -192,6 +192,7 @@ rules:
- k8s.io/kubernetes/pkg/scheduler/internal/parallelize - k8s.io/kubernetes/pkg/scheduler/internal/parallelize
- k8s.io/kubernetes/pkg/scheduler/internal/queue - k8s.io/kubernetes/pkg/scheduler/internal/queue
- k8s.io/kubernetes/pkg/scheduler/listers - k8s.io/kubernetes/pkg/scheduler/listers
- k8s.io/kubernetes/pkg/scheduler/testing
- k8s.io/kubernetes/pkg/scheduler/metrics - k8s.io/kubernetes/pkg/scheduler/metrics
- k8s.io/kubernetes/pkg/scheduler/nodeinfo - k8s.io/kubernetes/pkg/scheduler/nodeinfo
- k8s.io/kubernetes/pkg/scheduler/util - k8s.io/kubernetes/pkg/scheduler/util