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/08/20 21:33:05 UTC
mesos git commit: Returned failure in cgroups isolator cleanup if
container is unknown.
Repository: mesos
Updated Branches:
refs/heads/master 75416aaf5 -> 6e4e5959b
Returned failure in cgroups isolator cleanup if container is unknown.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6e4e5959
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6e4e5959
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6e4e5959
Branch: refs/heads/master
Commit: 6e4e5959b407c8554b36e4449af91e782fbaa453
Parents: 75416aa
Author: Jie Yu <yu...@gmail.com>
Authored: Sat Aug 20 14:32:51 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Sat Aug 20 14:32:51 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6e4e5959/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 5be2b71..0c72452 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
@@ -635,12 +635,8 @@ Future<ContainerStatus> CgroupsIsolatorProcess::status(
Future<Nothing> CgroupsIsolatorProcess::cleanup(
const ContainerID& containerId)
{
- // Multiple calls may occur during test clean up.
if (!infos.contains(containerId)) {
- VLOG(1) << "Ignoring cleanup request for unknown container: "
- << containerId;
-
- return Nothing();
+ return Failure("Unknown container");
}
list<Future<Nothing>> cleanups;