apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-21 23:19:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MaxCPU and MaxMemory semantics

Browse Source 
If a limit of 0 (or negative) is given for both cpu and memory, then
no limiting will be triggered. If any value between 1 and 100 (inclusive)
is given, then limiting will be triggered when that limit is reached.

I.e. giving a limit of 100 doesn't not mean unlimited.
This commit is contained in:
Ingo Oppermann
2023-07-12 11:53:39 +02:00
parent 519f39b217
commit 51d8b30e8f
2 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
resources/resources.go
View File

@@ -54,6 +54,12 @@ type Config struct {
} }
func New(config Config) (Resources, error) { func New(config Config) (Resources, error) {
isUnlimited := false
if config.MaxCPU <= 0 && config.MaxMemory <= 0 {
isUnlimited = true
}
if config.MaxCPU <= 0 { if config.MaxCPU <= 0 {
config.MaxCPU = 100 config.MaxCPU = 100
} }
@@ -67,13 +73,10 @@ func New(config Config) (Resources, error) {
} }
r := &resources{ r := &resources{
maxCPU: config.MaxCPU, maxCPU: config.MaxCPU,
psutil: config.PSUtil, psutil: config.PSUtil,
logger: config.Logger, isUnlimited: isUnlimited,
} logger: config.Logger,
if config.MaxCPU == 100 && config.MaxMemory == 100 {
r.isUnlimited = true
} }
if r.logger == nil { if r.logger == nil {
@@ -167,31 +170,35 @@ func (r *resources) observe(ctx context.Context, interval time.Duration) {
doCPULimit := false doCPULimit := false
if !r.isCPULimiting { if !r.isUnlimited {
if cpuload > r.maxCPU { if !r.isCPULimiting {
r.logger.Debug().WithField("cpu", cpuload).Log("CPU limit reached") if cpuload >= r.maxCPU {
r.logger.Debug().WithField("cpu", cpuload).Log("CPU limit reached")
doCPULimit = true
}
} else {
doCPULimit = true doCPULimit = true
} if cpuload < r.maxCPU {
} else { r.logger.Debug().WithField("cpu", cpuload).Log("CPU limit released")
doCPULimit = true doCPULimit = false
if cpuload <= r.maxCPU { }
r.logger.Debug().WithField("cpu", cpuload).Log("CPU limit released")
doCPULimit = false
} }
} }
doMemoryLimit := false doMemoryLimit := false
if !r.isMemoryLimiting { if !r.isUnlimited {
if vmstat.Used > r.maxMemory { if !r.isMemoryLimiting {
r.logger.Debug().WithField("memory", vmstat.Used).Log("Memory limit reached") if vmstat.Used >= r.maxMemory {
r.logger.Debug().WithField("memory", vmstat.Used).Log("Memory limit reached")
doMemoryLimit = true
}
} else {
doMemoryLimit = true doMemoryLimit = true
} if vmstat.Used < r.maxMemory {
} else { r.logger.Debug().WithField("memory", vmstat.Used).Log("Memory limit released")
doMemoryLimit = true doMemoryLimit = false
if vmstat.Used <= r.maxMemory { }
r.logger.Debug().WithField("memory", vmstat.Used).Log("Memory limit released")
doMemoryLimit = false
} }
} }

10
resources/resources_test.go
View File

@@ -177,6 +177,16 @@ func TestHasLimits(t *testing.T) {
require.True(t, r.HasLimits()) require.True(t, r.HasLimits())
r, err = New(Config{
MaxCPU: 100,
MaxMemory: 100,
PSUtil: &util{},
Logger: nil,
})
require.NoError(t, err)
require.True(t, r.HasLimits())
r, err = New(Config{ r, err = New(Config{
MaxCPU: 0, MaxCPU: 0,
MaxMemory: 0, MaxMemory: 0,