Repository: mesos Updated Branches: refs/heads/master 20afa5e79 -> 803031d94
Fixed the memory limitation construction. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/803031d9 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/803031d9 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/803031d9 Branch: refs/heads/master Commit: 803031d94d1d68c421f204045838833cf22d2c8f Parents: 27b6e87 Author: Benjamin Mahler <[email protected]> Authored: Wed Sep 3 13:57:27 2014 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Wed Sep 3 14:01:16 2014 -0700 ---------------------------------------------------------------------- src/slave/containerizer/isolators/cgroups/mem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/803031d9/src/slave/containerizer/isolators/cgroups/mem.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/mem.cpp b/src/slave/containerizer/isolators/cgroups/mem.cpp index 3ba580d..fb3db88 100644 --- a/src/slave/containerizer/isolators/cgroups/mem.cpp +++ b/src/slave/containerizer/isolators/cgroups/mem.cpp @@ -576,7 +576,7 @@ void CgroupsMemIsolatorProcess::oom(const ContainerID& containerId) Resource mem = Resources::parse( "mem", - stringify(usage.isSome() ? usage.get().bytes() : 0), + stringify(usage.isSome() ? usage.get().megabytes() : 0), "*").get(); info->limitation.set(Limitation(mem, message.str()));
