You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/07/27 22:45:32 UTC
mesos git commit: Implemented `CgroupsIsolatorProcess::watch`.
Repository: mesos
Updated Branches:
refs/heads/master 10f029bfd -> 43886b946
Implemented `CgroupsIsolatorProcess::watch`.
Review: https://reviews.apache.org/r/49821/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/43886b94
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/43886b94
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/43886b94
Branch: refs/heads/master
Commit: 43886b94689b63a626512bb99c3087b1802ecbca
Parents: 10f029b
Author: haosdent huang <ha...@gmail.com>
Authored: Wed Jul 27 15:39:55 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jul 27 15:41:51 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/43886b94/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
index 364bc77..9933cb0 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
@@ -255,7 +255,11 @@ Future<Nothing> CgroupsIsolatorProcess::isolate(
Future<ContainerLimitation> CgroupsIsolatorProcess::watch(
const ContainerID& containerId)
{
- return Failure("Not implemented.");
+ if (!infos.contains(containerId)) {
+ return Failure("Unknown container");
+ }
+
+ return infos[containerId]->limitation.future();
}