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/02/11 02:38:06 UTC
[4/6] mesos git commit: Fixed owned pointer reset in containerizer
launch.
Fixed owned pointer reset in containerizer launch.
Review: https://reviews.apache.org/r/43454/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0d74fb6a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0d74fb6a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0d74fb6a
Branch: refs/heads/master
Commit: 0d74fb6a60870367b7046170c6f0855a0053f955
Parents: ab9aa58
Author: Gilbert Song <so...@gmail.com>
Authored: Wed Feb 10 16:55:32 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Feb 10 16:55:32 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/containerizer.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d74fb6a/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index b484630..3de214d 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -759,13 +759,13 @@ Future<bool> MesosContainerizerProcess::_launch(
const Image& image = volume->image();
futures.push_back(provisioner->provision(containerId, image)
- .then([=](const ProvisionInfo& info) mutable -> Future<Nothing> {
+ .then([=](const ProvisionInfo& info) -> Future<Nothing> {
volume->set_host_path(info.rootfs);
if (taskInfo.isSome() &&
volume->container_path() ==
COMMAND_EXECUTOR_ROOTFS_CONTAINER_PATH) {
- _provisionInfo.reset(new Option<ProvisionInfo>(info));
+ *_provisionInfo = info;
}
return Nothing();