You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ya...@apache.org on 2016/07/06 21:54:10 UTC
[5/5] mesos git commit: Fail container launch if it's destroyed
during logger->prepare().
Fail container launch if it's destroyed during logger->prepare().
Review: https://reviews.apache.org/r/49725
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dc18dd7a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dc18dd7a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dc18dd7a
Branch: refs/heads/master
Commit: dc18dd7a5ec48a184aeb1c5a7c475ecf7691734b
Parents: 114474c
Author: Jiang Yan Xu <xu...@apple.com>
Authored: Wed Jul 6 13:48:34 2016 -0700
Committer: Jiang Yan Xu <xu...@apple.com>
Committed: Wed Jul 6 14:53:46 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/containerizer.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/dc18dd7a/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index 5a6ec85..e946a28 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -1347,7 +1347,13 @@ Future<bool> MesosContainerizerProcess::isolate(
const ContainerID& containerId,
pid_t _pid)
{
- CHECK(containers_.contains(containerId));
+ if (!containers_.contains(containerId)) {
+ return Failure("Container is already destroyed");
+ }
+
+ if (containers_[containerId]->state == DESTROYING) {
+ return Failure("Container is currently being destroyed");
+ }
containers_[containerId]->state = ISOLATING;