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/03/08 02:32:21 UTC
mesos git commit: Fixed the logic for default docker cmd case.
Repository: mesos
Updated Branches:
refs/heads/master 7de8cdd4d -> e42f740cc
Fixed the logic for default docker cmd case.
Review: https://reviews.apache.org/r/44468/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e42f740c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e42f740c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e42f740c
Branch: refs/heads/master
Commit: e42f740ccb655c0478a3002c0b6fa90c1144f41c
Parents: 7de8cdd
Author: Gilbert Song <so...@gmail.com>
Authored: Mon Mar 7 17:32:10 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Mar 7 17:32:10 2016 -0800
----------------------------------------------------------------------
.../containerizer/mesos/isolators/docker/runtime.cpp | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e42f740c/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 0545fb7..f97a9a9 100644
--- a/src/slave/containerizer/mesos/isolators/docker/runtime.cpp
+++ b/src/slave/containerizer/mesos/isolators/docker/runtime.cpp
@@ -327,8 +327,22 @@ Result<CommandInfo> DockerRuntimeIsolatorProcess::getLaunchCommand(
}
} else if (config.cmd_size() > 0) {
command.set_value(config.cmd(0));
+
+ // Put user defined argv after default cmd[0].
+ command.clear_arguments();
command.add_arguments(config.cmd(0));
+ // Append all possible user argv after cmd[0].
+ if (!containerConfig.has_task_info()) {
+ // Custom executor case.
+ command.mutable_arguments()->MergeFrom(
+ containerConfig.executor_info().command().arguments());
+ } else {
+ // Command task case.
+ command.mutable_arguments()->MergeFrom(
+ containerConfig.task_info().command().arguments());
+ }
+
// Overwrite default cmd arguments if CommandInfo arguments
// are set by user.
if (command.arguments_size() == 1) {