You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by id...@apache.org on 2014/06/14 00:32:33 UTC
[3/5] git commit: Make unknown container not a Failure for
Isolator::cleanup.
Make unknown container not a Failure for Isolator::cleanup.
Review: https://reviews.apache.org/r/22049
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/16345a7b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/16345a7b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/16345a7b
Branch: refs/heads/master
Commit: 16345a7be08b48873e263ca9f9867f4b2f298f27
Parents: 4c83662
Author: Ian Downes <id...@twitter.com>
Authored: Thu May 29 13:23:04 2014 -0700
Committer: Ian Downes <id...@twitter.com>
Committed: Fri Jun 13 15:32:08 2014 -0700
----------------------------------------------------------------------
src/slave/containerizer/isolators/cgroups/cpushare.cpp | 5 ++++-
src/slave/containerizer/isolators/cgroups/mem.cpp | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/16345a7b/src/slave/containerizer/isolators/cgroups/cpushare.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.cpp b/src/slave/containerizer/isolators/cgroups/cpushare.cpp
index 3d253af..eb8933f 100644
--- a/src/slave/containerizer/isolators/cgroups/cpushare.cpp
+++ b/src/slave/containerizer/isolators/cgroups/cpushare.cpp
@@ -432,8 +432,11 @@ Future<ResourceStatistics> CgroupsCpushareIsolatorProcess::usage(
Future<Nothing> CgroupsCpushareIsolatorProcess::cleanup(
const ContainerID& containerId)
{
+ // Multiple calls may occur during test clean up.
if (!infos.contains(containerId)) {
- return Failure("Unknown container");
+ VLOG(1) << "Ignoring cleanup request for unknown container: "
+ << containerId;
+ return Nothing();
}
Info* info = CHECK_NOTNULL(infos[containerId]);
http://git-wip-us.apache.org/repos/asf/mesos/blob/16345a7b/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 60013d4..73b926f 100644
--- a/src/slave/containerizer/isolators/cgroups/mem.cpp
+++ b/src/slave/containerizer/isolators/cgroups/mem.cpp
@@ -367,8 +367,11 @@ Future<ResourceStatistics> CgroupsMemIsolatorProcess::usage(
Future<Nothing> CgroupsMemIsolatorProcess::cleanup(
const ContainerID& containerId)
{
+ // Multiple calls may occur during test clean up.
if (!infos.contains(containerId)) {
- return Failure("Unknown container");
+ VLOG(1) << "Ignoring cleanup request for unknown container: "
+ << containerId;
+ return Nothing();
}
Info* info = CHECK_NOTNULL(infos[containerId]);