You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/04/25 23:32:24 UTC
[31/50] mesos git commit: Fixed docker containerizer usage to check
for cgroup result.
Fixed docker containerizer usage to check for cgroup result.
Review: https://reviews.apache.org/r/41906/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dac9f4a3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dac9f4a3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dac9f4a3
Branch: refs/heads/0.26.x
Commit: dac9f4a376834b149ac11b32ce030aebd02a0f67
Parents: 040b067
Author: Timothy Chen <tn...@apache.org>
Authored: Tue Jan 12 10:39:57 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Fri Feb 26 20:59:06 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/docker.cpp | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/dac9f4a3/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index 435631d..5189041 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -1299,6 +1299,8 @@ Try<ResourceStatistics> DockerContainerizerProcess::cgroupsStatistics(
return Error(
"Failed to determine cgroup for the 'cpu' subsystem: " +
cpuCgroup.error());
+ } else if (cpuCgroup.isNone()) {
+ return Error("Unable to find 'cpu' cgroup subsystem");
}
const Result<string> memCgroup = cgroups::memory::cgroup(pid);
@@ -1306,6 +1308,8 @@ Try<ResourceStatistics> DockerContainerizerProcess::cgroupsStatistics(
return Error(
"Failed to determine cgroup for the 'memory' subsystem: " +
memCgroup.error());
+ } else if (memCgroup.isNone()) {
+ return Error("Unable to find 'memory' cgroup subsystem");
}
const Try<cgroups::cpuacct::Stats> cpuAcctStat =