You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by tn...@apache.org on 2014/11/01 19:30:50 UTC
git commit: Revised comments on previous command executor launching
patch.
Repository: mesos
Updated Branches:
refs/heads/master 36a26c3ca -> 14d280971
Revised comments on previous command executor launching patch.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/14d28097
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/14d28097
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/14d28097
Branch: refs/heads/master
Commit: 14d28097104b176fe62a8d8de6b638bf3dc2282f
Parents: 36a26c3
Author: Timothy Chen <tn...@apache.org>
Authored: Sat Nov 1 11:31:14 2014 -0700
Committer: Timothy Chen <tn...@apache.org>
Committed: Sat Nov 1 11:31:30 2014 -0700
----------------------------------------------------------------------
src/slave/slave.cpp | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/14d28097/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 8aa3524..5e9b0e4 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -2674,9 +2674,12 @@ ExecutorInfo Slave::getExecutorInfo(
executor.set_name("Command Executor " + name);
executor.set_source(task.task_id().value());
- // Copy [uris, environment, container, user] fields from the
- // CommandInfo to get the URIs and environment, and use them
- // to invoke 'mesos-executor'.
+ // Copy the [uris, environment, container, user] fields from the
+ // CommandInfo to get the URIs we need to download, the
+ // environment variables that should get set, the necessary
+ // container information, and the user to run the executor as but
+ // nothing else because we need to set up the rest of the executor
+ // command ourselves in order to invoke 'mesos-executor'.
executor.mutable_command()->mutable_uris()->MergeFrom(
task.command().uris());
@@ -2697,8 +2700,9 @@ ExecutorInfo Slave::getExecutorInfo(
Result<string> path = os::realpath(
path::join(flags.launcher_dir, "mesos-executor"));
- // Strongly enforce a specific shell setting for launching
- // command executor.
+ // Explicitly set 'shell' to true since we want to use the shell
+ // for running the mesos-executor (and even though this is the
+ // default we want to be explicit).
executor.mutable_command()->set_shell(true);
if (path.isSome()) {