Repository: mesos Updated Branches: refs/heads/master 3ca369141 -> 5418b0ab9
Implemented the `status` method in CgroupNetClsIsolatorProcess. Review: https://reviews.apache.org/r/42947/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0649443e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0649443e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0649443e Branch: refs/heads/master Commit: 0649443e74b83079d509073b715205ccd9147e59 Parents: 3ca3691 Author: Avinash sridharan <[email protected]> Authored: Tue Feb 9 07:19:38 2016 -0800 Committer: Jie Yu <[email protected]> Committed: Tue Feb 9 07:22:02 2016 -0800 ---------------------------------------------------------------------- .../mesos/isolators/cgroups/net_cls.cpp | 22 ++++++++++++++++++++ .../mesos/isolators/cgroups/net_cls.hpp | 3 +++ 2 files changed, 25 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/0649443e/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp b/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp index f8eb587..2fc7997 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp @@ -397,6 +397,28 @@ Future<ResourceStatistics> CgroupsNetClsIsolatorProcess::usage( } +Future<ContainerStatus> CgroupsNetClsIsolatorProcess::status( + const ContainerID& containerId) +{ + if (!infos.contains(containerId)) { + return Failure("Unknown container"); + } + + const Info& info = infos.at(containerId); + + ContainerStatus status; + + if (info.handle.isSome()) { + CgroupInfo* cgroupInfo = status.mutable_cgroup_info(); + CgroupInfo::NetCls* netCls = cgroupInfo->mutable_net_cls(); + + netCls->set_classid(info.handle->get()); + } + + return status; +} + + Future<Option<ContainerLaunchInfo>> CgroupsNetClsIsolatorProcess::prepare( const ContainerID& containerId, const ContainerConfig& containerConfig) http://git-wip-us.apache.org/repos/asf/mesos/blob/0649443e/src/slave/containerizer/mesos/isolators/cgroups/net_cls.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/net_cls.hpp b/src/slave/containerizer/mesos/isolators/cgroups/net_cls.hpp index 3f8d07c..b22b9f6 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/net_cls.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/net_cls.hpp @@ -145,6 +145,9 @@ public: virtual process::Future<ResourceStatistics> usage( const ContainerID& containerId); + virtual process::Future<ContainerStatus> status( + const ContainerID& containerId); + virtual process::Future<Nothing> cleanup( const ContainerID& containerId);
