Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions deploy/docker/tests/test_utils_memory.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
from types import SimpleNamespace

import psutil
import pytest

import utils


def test_unlimited_cgroup_v2_uses_container_usage(monkeypatch):
values = {
"/sys/fs/cgroup/memory.current": "805306368\n",
"/sys/fs/cgroup/memory.max": "max\n",
}

class FakeCgroupPath:
def __init__(self, path):
self.path = path

def exists(self):
return self.path in values

def read_text(self):
return values[self.path]

monkeypatch.setattr(utils, "Path", FakeCgroupPath)
monkeypatch.setattr(
psutil,
"virtual_memory",
lambda: SimpleNamespace(total=16 * 1024**3, percent=50.3),
)

assert utils.get_container_memory_percent() == pytest.approx(4.6875)
11 changes: 8 additions & 3 deletions deploy/docker/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,15 +420,20 @@ def get_container_memory_percent() -> float:
limit_path = Path("/sys/fs/cgroup/memory/memory.limit_in_bytes")

usage = int(usage_path.read_text())
limit = int(limit_path.read_text())
raw_limit = limit_path.read_text().strip()

# Handle unlimited (v2: "max", v1: > 1e18)
if limit > 1e18:
if raw_limit == "max":
import psutil
limit = psutil.virtual_memory().total
else:
limit = int(raw_limit)
if limit > 1e18:
import psutil
limit = psutil.virtual_memory().total

return (usage / limit) * 100
except:
# Non-container or unsupported: fallback to host
import psutil
return psutil.virtual_memory().percent
return psutil.virtual_memory().percent
Loading