diff --git a/pkg/scheduler/api/resource_info.go b/pkg/scheduler/api/resource_info.go index ca7c6a2588..c9c919890d 100644 --- a/pkg/scheduler/api/resource_info.go +++ b/pkg/scheduler/api/resource_info.go @@ -374,14 +374,6 @@ func (r *Resource) Less(rr *Resource, defaultValue DimensionDefaultValue) bool { return false } - if defaultValue == Infinity { - for name := range rr.ScalarResources { - if _, ok := r.ScalarResources[name]; !ok { - return false - } - } - } - for resourceName, leftValue := range r.ScalarResources { rightValue, ok := rr.ScalarResources[resourceName] if !ok && defaultValue == Infinity { @@ -413,14 +405,6 @@ func (r *Resource) LessEqual(rr *Resource, defaultValue DimensionDefaultValue) b return false } - if defaultValue == Infinity { - for name := range rr.ScalarResources { - if _, ok := r.ScalarResources[name]; !ok { - return false - } - } - } - for resourceName, leftValue := range r.ScalarResources { rightValue, ok := rr.ScalarResources[resourceName] if !ok && defaultValue == Infinity { diff --git a/pkg/scheduler/api/resource_info_test.go b/pkg/scheduler/api/resource_info_test.go index aae76e228d..aa8b4c94bd 100644 --- a/pkg/scheduler/api/resource_info_test.go +++ b/pkg/scheduler/api/resource_info_test.go @@ -562,7 +562,7 @@ func TestLess(t *testing.T) { Memory: 2000, ScalarResources: map[v1.ResourceName]float64{"scalar.test/scalar1": 1000, "hugepages-test": 2000}, }, - expected: false, + expected: true, }, { resource1: &Resource{ @@ -706,7 +706,7 @@ func TestLessEqual(t *testing.T) { Memory: 2000, ScalarResources: map[v1.ResourceName]float64{"scalar.test/scalar1": 1000, "hugepages-test": 2000}, }, - expected: false, + expected: true, }, { resource1: &Resource{ @@ -727,7 +727,7 @@ func TestLessEqual(t *testing.T) { Memory: 2000, ScalarResources: map[v1.ResourceName]float64{"scalar.test/scalar1": 1000, "hugepages-test": 2000}, }, - expected: false, + expected: true, }, { resource1: &Resource{