wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-07-02 10:12:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

No warning for docker memory > system memory (#7151)

Browse Source
This commit is contained in:
Alex Wu
2020-02-13 15:21:44 -08:00
committed by GitHub
parent b81b93a9c0
commit 0d3687a10d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/utils.py
+4 -5
View File
@@ -402,8 +402,8 @@ def get_system_memory():
psutil_memory_in_bytes = psutil.virtual_memory().total
if docker_limit is not None:
if docker_limit > psutil_memory_in_bytes:
logger.warn("Container memory is larger than system memory.")
# We take the min because the cgroup limit is very large if we aren't
# in Docker.
return min(docker_limit, psutil_memory_in_bytes)
return psutil_memory_in_bytes
@@ -427,9 +427,8 @@ def get_used_memory():
psutil_memory_in_bytes = psutil.virtual_memory().used
if docker_usage is not None:
if docker_usage > psutil_memory_in_bytes:
logger.warn("Container is reporting more memory usage than the"
"system.")
# We take the min because the cgroup limit is very large if we aren't
# in Docker.
return min(docker_usage, psutil_memory_in_bytes)
return psutil_memory_in_bytes