Only set cpu limits if specified; closes pterodactyl/panel#3988
This commit is contained in:
parent
8bd1ebe360
commit
6c98a955e3
|
@ -480,21 +480,3 @@ func (e *Environment) convertMounts() []mount.Mount {
|
||||||
|
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *Environment) resources() container.Resources {
|
|
||||||
l := e.Configuration.Limits()
|
|
||||||
pids := l.ProcessLimit()
|
|
||||||
|
|
||||||
return container.Resources{
|
|
||||||
Memory: l.BoundedMemoryLimit(),
|
|
||||||
MemoryReservation: l.MemoryLimit * 1_000_000,
|
|
||||||
MemorySwap: l.ConvertedSwap(),
|
|
||||||
CPUQuota: l.ConvertedCpuLimit(),
|
|
||||||
CPUPeriod: 100_000,
|
|
||||||
CPUShares: 1024,
|
|
||||||
BlkioWeight: l.IoWeight,
|
|
||||||
OomKillDisable: &l.OOMDisabled,
|
|
||||||
CpusetCpus: l.Threads,
|
|
||||||
PidsLimit: &pids,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -99,21 +99,36 @@ func (l Limits) ProcessLimit() int64 {
|
||||||
return config.Get().Docker.ContainerPidLimit
|
return config.Get().Docker.ContainerPidLimit
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AsContainerResources returns the available resources for a container in a format
|
||||||
|
// that Docker understands.
|
||||||
func (l Limits) AsContainerResources() container.Resources {
|
func (l Limits) AsContainerResources() container.Resources {
|
||||||
pids := l.ProcessLimit()
|
pids := l.ProcessLimit()
|
||||||
|
resources := container.Resources{
|
||||||
return container.Resources{
|
|
||||||
Memory: l.BoundedMemoryLimit(),
|
Memory: l.BoundedMemoryLimit(),
|
||||||
MemoryReservation: l.MemoryLimit * 1_000_000,
|
MemoryReservation: l.MemoryLimit * 1_000_000,
|
||||||
MemorySwap: l.ConvertedSwap(),
|
MemorySwap: l.ConvertedSwap(),
|
||||||
CPUQuota: l.ConvertedCpuLimit(),
|
|
||||||
CPUPeriod: 100_000,
|
|
||||||
CPUShares: 1024,
|
|
||||||
BlkioWeight: l.IoWeight,
|
BlkioWeight: l.IoWeight,
|
||||||
OomKillDisable: &l.OOMDisabled,
|
OomKillDisable: &l.OOMDisabled,
|
||||||
CpusetCpus: l.Threads,
|
|
||||||
PidsLimit: &pids,
|
PidsLimit: &pids,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If the CPU Limit is not set, don't send any of these fields through. Providing
|
||||||
|
// them seems to break some Java services that try to read the available processors.
|
||||||
|
//
|
||||||
|
// @see https://github.com/pterodactyl/panel/issues/3988
|
||||||
|
if l.CpuLimit > 0 {
|
||||||
|
resources.CPUQuota = l.CpuLimit * 1_000
|
||||||
|
resources.CPUPeriod = 100_00
|
||||||
|
resources.CPUShares = 1024
|
||||||
|
}
|
||||||
|
|
||||||
|
// Similar to above, don't set the specific assigned CPUs if we didn't actually limit
|
||||||
|
// the server to any of them.
|
||||||
|
if l.Threads != "" {
|
||||||
|
resources.CpusetCpus = l.Threads
|
||||||
|
}
|
||||||
|
|
||||||
|
return resources
|
||||||
}
|
}
|
||||||
|
|
||||||
type Variables map[string]interface{}
|
type Variables map[string]interface{}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user