This is an automated email from the ASF dual-hosted git repository. qianzhang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push: new 68ce147 Set OOM score adj when Docker container's memory limit is infinite. 68ce147 is described below commit 68ce1476aebe10db7107c0f3dc813af78ec20cef Author: Qian Zhang <zhq527...@gmail.com> AuthorDate: Mon Apr 27 14:14:15 2020 +0800 Set OOM score adj when Docker container's memory limit is infinite. Review: https://reviews.apache.org/r/72435 --- src/docker/docker.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index a5f15dd..8ad5833 100644 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -700,7 +700,8 @@ Try<Docker::RunOptions> Docker::RunOptions::create( if (memRequest.isSome()) { options.memoryReservation = std::max(memRequest.get(), MIN_MEMORY); - if (memRequest.get() < Megabytes(static_cast<uint64_t>(memLimit.get()))) { + if (std::isinf(memLimit.get()) || + memRequest.get() < Megabytes(static_cast<uint64_t>(memLimit.get()))) { Try<int> oomScoreAdj = calculateOOMScoreAdj(memRequest.get()); if (oomScoreAdj.isError()) { return Error(