From 285e036ab629f7a3a31f7ea1edf26e039a56c06b Mon Sep 17 00:00:00 2001 From: Kelvin Jin Date: Fri, 17 May 2019 15:34:19 -0700 Subject: src: configure v8 isolate with uv_get_constrained_memory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change adds the ability to set the memory ceiling for a Node.js process according to a memory limit set by cgroups (via uv_get_constrained_memory), which is used by docker containers to set resource constraints. Previously we would use the physical memory size to estimate the necessary V8 heap sizes, but the physical memory size is not necessarily the correct limit, e.g. if the process is running inside a docker container or is otherwise constrained. Non-Linux systems shouldn't be affected. PR-URL: https://github.com/nodejs/node/pull/27508 Reviewed-By: Anna Henningsen Reviewed-By: Ali Ijaz Sheikh Reviewed-By: Colin Ihrig Reviewed-By: Сковорода Никита Андреевич Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell Reviewed-By: Michael Dawson --- src/api/environment.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/api') diff --git a/src/api/environment.cc b/src/api/environment.cc index 8c1f5aaff2..4389dba139 100644 --- a/src/api/environment.cc +++ b/src/api/environment.cc @@ -179,7 +179,10 @@ void FreeArrayBufferAllocator(ArrayBufferAllocator* allocator) { } void SetIsolateCreateParamsForNode(Isolate::CreateParams* params) { - const uint64_t total_memory = uv_get_total_memory(); + const uint64_t constrained_memory = uv_get_constrained_memory(); + const uint64_t total_memory = constrained_memory > 0 ? + std::min(uv_get_total_memory(), constrained_memory) : + uv_get_total_memory(); if (total_memory > 0) { // V8 defaults to 700MB or 1.4GB on 32 and 64 bit platforms respectively. // This default is based on browser use-cases. Tell V8 to configure the -- cgit v1.2.3