From 519f39b2170c55375968843e136348959982b5d1 Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Wed, 12 Jul 2023 11:38:40 +0200 Subject: [PATCH] Fix returning wrong value for HasLimits --- resources/resources.go | 4 ++-- resources/resources_test.go | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/resources/resources.go b/resources/resources.go index 28ad14be..aa910153 100644 --- a/resources/resources.go +++ b/resources/resources.go @@ -72,7 +72,7 @@ func New(config Config) (Resources, error) { logger: config.Logger, } - if config.MaxCPU == 1000 && config.MaxMemory == 1000 { + if config.MaxCPU == 100 && config.MaxMemory == 100 { r.isUnlimited = true } @@ -217,7 +217,7 @@ func (r *resources) observe(ctx context.Context, interval time.Duration) { } func (r *resources) HasLimits() bool { - return r.isUnlimited + return !r.isUnlimited } func (r *resources) Limits() (float64, uint64) { diff --git a/resources/resources_test.go b/resources/resources_test.go index 91132c4d..ec502265 100644 --- a/resources/resources_test.go +++ b/resources/resources_test.go @@ -165,3 +165,25 @@ func TestRequest(t *testing.T) { err = r.Request(10, 10) require.NoError(t, err) } + +func TestHasLimits(t *testing.T) { + r, err := New(Config{ + MaxCPU: 70., + MaxMemory: 170. / 200. * 100, + PSUtil: &util{}, + Logger: nil, + }) + require.NoError(t, err) + + require.True(t, r.HasLimits()) + + r, err = New(Config{ + MaxCPU: 0, + MaxMemory: 0, + PSUtil: &util{}, + Logger: nil, + }) + require.NoError(t, err) + + require.False(t, r.HasLimits()) +}