Repository: mesos Updated Branches: refs/heads/master 7ac3258e5 -> 035b1c4e1
Reported "unevictable" memory in container statistics. Review: https://reviews.apache.org/r/35668 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/035b1c4e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/035b1c4e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/035b1c4e Branch: refs/heads/master Commit: 035b1c4e1d7e2eb098a1fe80ff3d1d43a11aac6a Parents: 7ac3258 Author: Chi Zhang <[email protected]> Authored: Tue Aug 11 11:20:21 2015 -0700 Committer: Jie Yu <[email protected]> Committed: Tue Aug 11 11:20:21 2015 -0700 ---------------------------------------------------------------------- include/mesos/mesos.proto | 1 + src/slave/containerizer/isolators/cgroups/mem.cpp | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/035b1c4e/include/mesos/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto index 913bcbf..8a423a5 100644 --- a/include/mesos/mesos.proto +++ b/include/mesos/mesos.proto @@ -658,6 +658,7 @@ message ResourceStatistics { optional uint64 mem_mapped_file_bytes = 12; // This is only set if swap is enabled. optional uint64 mem_swap_bytes = 40; + optional uint64 mem_unevictable_bytes = 41; // Number of occurrences of different levels of memory pressure // events reported by memory cgroup. Pressure listening (re)starts http://git-wip-us.apache.org/repos/asf/mesos/blob/035b1c4e/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 48d7fbd..89c86be 100644 --- a/src/slave/containerizer/isolators/cgroups/mem.cpp +++ b/src/slave/containerizer/isolators/cgroups/mem.cpp @@ -476,6 +476,11 @@ Future<ResourceStatistics> CgroupsMemIsolatorProcess::usage( result.set_mem_swap_bytes(total_swap.get()); } + Option<uint64_t> total_unevictable = stat.get().get("total_unevictable"); + if (total_unevictable.isSome()) { + result.set_mem_unevictable_bytes(total_unevictable.get()); + } + // Get pressure counter readings. list<Level> levels; list<Future<uint64_t>> values;
