Repository: mesos Updated Branches: refs/heads/master eb4b19ba4 -> 00318fc1b
Only update docker container when resources differs. Review: https://reviews.apache.org/r/32796 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/591d1090 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/591d1090 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/591d1090 Branch: refs/heads/master Commit: 591d1090f69a7d9197aea355488c973c41881be7 Parents: eb4b19b Author: Timothy Chen <[email protected]> Authored: Wed Apr 1 16:03:43 2015 -0700 Committer: Timothy Chen <[email protected]> Committed: Fri Apr 3 12:49:35 2015 -0700 ---------------------------------------------------------------------- src/slave/containerizer/docker.cpp | 8 ++++++++ src/slave/containerizer/docker.hpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/591d1090/src/slave/containerizer/docker.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index e83b912..76e47cc 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -851,6 +851,14 @@ Future<Nothing> DockerContainerizerProcess::update( return Nothing(); } + if (container->resources == _resources) { + LOG(INFO) << "Ignoring updating container '" << containerId + << "' with resources passed to update is identical to " + << "existing resources"; + return Nothing(); + } + + // Store the resources for usage(). container->resources = _resources; http://git-wip-us.apache.org/repos/asf/mesos/blob/591d1090/src/slave/containerizer/docker.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.hpp b/src/slave/containerizer/docker.hpp index b7bf54a..5ae3a9d 100644 --- a/src/slave/containerizer/docker.hpp +++ b/src/slave/containerizer/docker.hpp @@ -290,7 +290,7 @@ private: flags(flags) { if (task.isSome()) { - resources = task.get().resources(); + resources = task.get().resources() + executor.resources(); } else { resources = executor.resources(); }
