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/25 18:45:33 UTC
[7/8] mesos git commit: Removed a NOTE in MesosContainerizer that no
longer applies.
Removed a NOTE in MesosContainerizer that no longer applies.
Previously, we need to initialize `launchInfos` because we don't yet
have an explicit state for PROVISIONING (MESOS-4878). After we
introduce the PROVISIONING state, it's guaranteed that `launchInfo`
will be set if the container is in PREPARING state. Therefore, the
NOTE and the corresponding code is no longer needed.
Review: https://reviews.apache.org/r/51417
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f4894ec9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f4894ec9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f4894ec9
Branch: refs/heads/master
Commit: f4894ec9b9b6b1e2e980204835e4f81a5215ea81
Parents: ee6b749
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Aug 24 22:08:28 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Aug 25 11:45:23 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/containerizer.cpp | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f4894ec9/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index b225e06..7584a11 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -882,12 +882,6 @@ Future<bool> MesosContainerizerProcess::launch(
container->config = containerConfig;
container->resources = containerConfig.resources();
- // We need to set the `launchInfos` to be a ready future initially
- // before we starting calling isolator->prepare() because otherwise,
- // the destroy will wait forever trying to wait for this future to
- // be ready, which it never will. See MESOS-4878.
- container->launchInfos = list<Option<ContainerLaunchInfo>>();
-
containers_.put(containerId, container);
// We'll first provision the image for the container, and