Removed the unneeded ExecutorInfo from Container struct in MesosContainerizer.
Review: https://reviews.apache.org/r/37142 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/39d5e5fe Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/39d5e5fe Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/39d5e5fe Branch: refs/heads/master Commit: 39d5e5fee2348d73235e9acee919d3ac21a53a33 Parents: 3a86213 Author: Jie Yu <[email protected]> Authored: Wed Aug 5 11:23:40 2015 -0700 Committer: Jie Yu <[email protected]> Committed: Fri Aug 7 16:54:14 2015 -0700 ---------------------------------------------------------------------- src/slave/containerizer/mesos/containerizer.cpp | 13 ------------- src/slave/containerizer/mesos/containerizer.hpp | 3 --- 2 files changed, 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/39d5e5fe/src/slave/containerizer/mesos/containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp index 78db4c1..758ed1c 100644 --- a/src/slave/containerizer/mesos/containerizer.cpp +++ b/src/slave/containerizer/mesos/containerizer.cpp @@ -477,18 +477,6 @@ Future<Nothing> MesosContainerizerProcess::__recover( // containers should be running after recover. container->state = RUNNING; - // Add the default container info to the executor info. - // TODO(jieyu): Checkpoint the default container info in case the - // slave changes the default container info flag. - ExecutorInfo executorInfo = run.executor_info(); - if (!executorInfo.has_container() && - flags.default_container_info.isSome()) { - executorInfo.mutable_container()->CopyFrom( - flags.default_container_info.get()); - } - - container->executorInfo = executorInfo; - containers_[containerId] = Owned<Container>(container); foreach (const Owned<Isolator>& isolator, isolators) { @@ -622,7 +610,6 @@ Future<bool> MesosContainerizerProcess::launch( << "' of framework '" << executorInfo.framework_id() << "'"; Container* container = new Container(); - container->executorInfo = executorInfo; container->directory = directory; container->state = PREPARING; container->resources = executorInfo.resources(); http://git-wip-us.apache.org/repos/asf/mesos/blob/39d5e5fe/src/slave/containerizer/mesos/containerizer.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/containerizer.hpp b/src/slave/containerizer/mesos/containerizer.hpp index 8bfd622..066d541 100644 --- a/src/slave/containerizer/mesos/containerizer.hpp +++ b/src/slave/containerizer/mesos/containerizer.hpp @@ -318,9 +318,6 @@ private: // ResourceStatistics limits in usage(). Resources resources; - // We keep track of the ExecutorInfo so we have the optional ContainerInfo. - ExecutorInfo executorInfo; - // The executor's working directory on the host. std::string directory;
