Use the right resources when starting Docker container. Review: https://reviews.apache.org/r/26619
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fdedd0b5 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fdedd0b5 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fdedd0b5 Branch: refs/heads/master Commit: fdedd0b5dd7e6875aed2fa0cd35f4ce85c593326 Parents: 9c3cd48 Author: Benjamin Hindman <[email protected]> Authored: Sat Oct 11 19:05:28 2014 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Fri Oct 31 15:05:39 2014 -0700 ---------------------------------------------------------------------- src/slave/containerizer/docker.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/fdedd0b5/src/slave/containerizer/docker.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index 57a6066..86b5ba9 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -924,15 +924,7 @@ Future<Nothing> DockerContainerizerProcess::__launch( container->name(), container->directory, flags.docker_sandbox_directory, - // TODO(benh): Figure out the right resources to pass here. - // Apparently when running a container for a task we pass the - // resources (taskInfo.resources()) but not when running a - // container for an executor!? Either way when we do an - // 'update' later we should properly set the resources but I - // don't know why in the past we were sometimes not passing - // resources (and I can't seem to find any documentation that - // addresses this issue). - None(), + container->resources, container->environment()); }
