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:07 UTC
[5/6] mesos git commit: Fixed adding executable as first argv in
runtime isolator.
Fixed adding executable as first argv in runtime isolator.
Review: https://reviews.apache.org/r/43455/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/38df717d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/38df717d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/38df717d
Branch: refs/heads/master
Commit: 38df717db59b2da892c5abd451e3dd92453de31d
Parents: 0d74fb6
Author: Gilbert Song <so...@gmail.com>
Authored: Wed Feb 10 16:55:36 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Feb 10 16:55:36 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/docker/runtime.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/38df717d/src/slave/containerizer/mesos/isolators/docker/runtime.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/docker/runtime.cpp b/src/slave/containerizer/mesos/isolators/docker/runtime.cpp
index 71c287c..1bb5e28 100644
--- a/src/slave/containerizer/mesos/isolators/docker/runtime.cpp
+++ b/src/slave/containerizer/mesos/isolators/docker/runtime.cpp
@@ -300,6 +300,7 @@ Result<CommandInfo> DockerRuntimeIsolatorProcess::getExecutorLaunchCommand(
// Put user defined argv after default entrypoint argv
// in sequence.
command.clear_arguments();
+ command.add_arguments(config.entrypoint(0));
for (int i = 1; i < config.entrypoint_size(); i++) {
command.add_arguments(config.entrypoint(i));
@@ -319,17 +320,18 @@ Result<CommandInfo> DockerRuntimeIsolatorProcess::getExecutorLaunchCommand(
// Overwrite default cmd arguments if CommandInfo arguments are
// set by user. The logic below is the case that no argument is
// set by user.
- if (command.arguments_size() == config.entrypoint_size() - 1) {
+ if (command.arguments_size() == config.entrypoint_size()) {
foreach (const string& cmd, config.cmd()) {
command.add_arguments(cmd);
}
}
} else if (config.cmd_size() > 0) {
command.set_value(config.cmd(0));
+ command.add_arguments(config.cmd(0));
// Overwrite default cmd arguments if CommandInfo arguments
// are set by user.
- if (command.arguments_size() == 0) {
+ if (command.arguments_size() == 1) {
for (int i = 1; i < config.cmd_size(); i++) {
command.add_arguments(config.cmd(i));
}