mirror of
https://github.com/VictoriaMetrics/VictoriaMetrics.git
synced 2025-03-21 15:45:01 +00:00
lib/memory: an attempt to read proper memory limit inside LXC container
Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/84
This commit is contained in:
parent
7354f10336
commit
593bd35aaa
2 changed files with 59 additions and 8 deletions
|
@ -2,6 +2,7 @@ package memory
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
"os/exec"
|
||||||
"strconv"
|
"strconv"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
|
@ -19,17 +20,48 @@ func sysTotalMemory() int {
|
||||||
// See https://stackoverflow.com/questions/42187085/check-mem-limit-within-a-docker-container .
|
// See https://stackoverflow.com/questions/42187085/check-mem-limit-within-a-docker-container .
|
||||||
data, err := ioutil.ReadFile("/sys/fs/cgroup/memory/memory.limit_in_bytes")
|
data, err := ioutil.ReadFile("/sys/fs/cgroup/memory/memory.limit_in_bytes")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return totalMem
|
// Try determining the amount of memory inside lxc container.
|
||||||
|
mem, err := readLXCMemoryLimit(totalMem)
|
||||||
|
if err != nil {
|
||||||
|
return totalMem
|
||||||
|
}
|
||||||
|
return mem
|
||||||
}
|
}
|
||||||
for len(data) > 0 && data[len(data)-1] == '\n' {
|
mem, err := readPositiveInt(data, totalMem)
|
||||||
data = data[:len(data)-1]
|
|
||||||
}
|
|
||||||
mem, err := strconv.Atoi(string(data))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return totalMem
|
return totalMem
|
||||||
}
|
}
|
||||||
if mem > totalMem {
|
|
||||||
mem = totalMem
|
|
||||||
}
|
|
||||||
return mem
|
return mem
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func readLXCMemoryLimit(totalMem int) (int, error) {
|
||||||
|
// Read memory limit according to https://unix.stackexchange.com/questions/242718/how-to-find-out-how-much-memory-lxc-container-is-allowed-to-consume
|
||||||
|
// This should properly determine the limit inside lxc container.
|
||||||
|
// See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/84
|
||||||
|
cmd := exec.Command("/bin/sh", "-c",
|
||||||
|
`cat $(mount | grep cgroup | grep memory | cut -d" " -f3)$(cat /proc/self/cgroup | grep memory | cut -d: -f3)/memory.limit_in_bytes`)
|
||||||
|
data, err := cmd.Output()
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return readPositiveInt(data, totalMem)
|
||||||
|
}
|
||||||
|
|
||||||
|
func readPositiveInt(data []byte, maxN int) (int, error) {
|
||||||
|
for len(data) > 0 && data[len(data)-1] == '\n' {
|
||||||
|
data = data[:len(data)-1]
|
||||||
|
}
|
||||||
|
n, err := strconv.ParseUint(string(data), 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
if int64(n) < 0 || int64(int(n)) != int64(n) {
|
||||||
|
// Int overflow.
|
||||||
|
return maxN, nil
|
||||||
|
}
|
||||||
|
ni := int(n)
|
||||||
|
if ni > maxN {
|
||||||
|
return maxN, nil
|
||||||
|
}
|
||||||
|
return ni, nil
|
||||||
|
}
|
||||||
|
|
19
lib/memory/memory_linux_test.go
Normal file
19
lib/memory/memory_linux_test.go
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
package memory
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestReadLXCMemoryLimit(t *testing.T) {
|
||||||
|
const maxMem = 1<<31 - 1
|
||||||
|
n, err := readLXCMemoryLimit(maxMem)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error in readLXCMemoryLimit: %s", err)
|
||||||
|
}
|
||||||
|
if n < 0 {
|
||||||
|
t.Fatalf("n must be positive; got %d", n)
|
||||||
|
}
|
||||||
|
if n > maxMem {
|
||||||
|
t.Fatalf("n must be smaller than maxMem=%d; got %d", maxMem, n)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue