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 2015/02/11 00:37:19 UTC
[2/2] mesos git commit: Added executor working directory to Container
struct in Mesos containerizer.
Added executor working directory to Container struct in Mesos containerizer.
Review: https://reviews.apache.org/r/30509
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/54545657
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/54545657
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/54545657
Branch: refs/heads/master
Commit: 54545657c685456d32ed5c5d3f6d4d0ff12ef295
Parents: 262ddd7
Author: Jie Yu <yu...@gmail.com>
Authored: Sun Feb 1 20:48:08 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Feb 10 15:23:36 2015 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/containerizer.cpp | 5 +++++
src/slave/containerizer/mesos/containerizer.hpp | 3 +++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/54545657/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index d2fa50d..d5b90d1 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -383,9 +383,13 @@ Future<Nothing> MesosContainerizerProcess::__recover(
const ContainerID& containerId = run.id;
Container* container = new Container();
+
Future<Option<int>> status = process::reap(run.pid);
status.onAny(defer(self(), &Self::reaped, containerId));
container->status = status;
+
+ container->directory = run.directory;
+
// We only checkpoint the containerizer pid after the container
// successfully launched, therefore we can assume checkpointed
// containers should be running after recover.
@@ -443,6 +447,7 @@ Future<bool> MesosContainerizerProcess::launch(
Container* container = new Container();
container->resources = executorInfo.resources();
+ container->directory = directory;
container->state = PREPARING;
containers_[containerId] = Owned<Container>(container);
http://git-wip-us.apache.org/repos/asf/mesos/blob/54545657/src/slave/containerizer/mesos/containerizer.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.hpp b/src/slave/containerizer/mesos/containerizer.hpp
index b7015be..074a2d8 100644
--- a/src/slave/containerizer/mesos/containerizer.hpp
+++ b/src/slave/containerizer/mesos/containerizer.hpp
@@ -258,6 +258,9 @@ private:
// ResourceStatistics limits in usage().
Resources resources;
+ // The executor's working directory on the host.
+ std::string directory;
+
// The path to the container's rootfs, if full filesystem
// isolation is used.
Option<std::string> rootfs;