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 2017/01/11 20:43:26 UTC

[1/3] mesos git commit: Fixed appc runtime isolator argv issue for nested container.

Repository: mesos
Updated Branches:
  refs/heads/1.1.x 6798ba84a -> 1279c3b08


Fixed appc runtime isolator argv issue for nested container.

Review: https://reviews.apache.org/r/55413/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/df69c4fb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/df69c4fb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/df69c4fb

Branch: refs/heads/1.1.x
Commit: df69c4fb04837cfe32aa909ded5663c8b4fca82e
Parents: 822c7e8
Author: Gilbert Song <so...@gmail.com>
Authored: Wed Jan 11 09:01:29 2017 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jan 11 09:34:29 2017 -0800

----------------------------------------------------------------------
 .../containerizer/mesos/isolators/appc/runtime.cpp      | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/df69c4fb/src/slave/containerizer/mesos/isolators/appc/runtime.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/appc/runtime.cpp b/src/slave/containerizer/mesos/isolators/appc/runtime.cpp
index b0782d9..9bc3fd8 100644
--- a/src/slave/containerizer/mesos/isolators/appc/runtime.cpp
+++ b/src/slave/containerizer/mesos/isolators/appc/runtime.cpp
@@ -33,6 +33,8 @@
 using std::list;
 using std::string;
 
+using google::protobuf::RepeatedPtrField;
+
 using process::Failure;
 using process::Future;
 using process::Owned;
@@ -270,16 +272,10 @@ Result<CommandInfo> AppcRuntimeIsolatorProcess::getLaunchCommand(
   if (app.exec_size() > 0) {
     command.set_value(app.exec(0));
 
+    const RepeatedPtrField<string> arguments = command.arguments();
     command.clear_arguments();
     command.add_arguments(app.exec(0));
-
-    if (!containerConfig.has_task_info()) {
-      command.mutable_arguments()->MergeFrom(
-          containerConfig.executor_info().command().arguments());
-    } else {
-      command.mutable_arguments()->MergeFrom(
-          containerConfig.task_info().command().arguments());
-    }
+    command.mutable_arguments()->MergeFrom(arguments);
 
     if (command.arguments_size() == 1) {
       for (int i = 1; i < app.exec_size(); i++) {


[3/3] mesos git commit: Added MESOS-6852 to 1.1.1 CHANGELOG.

Posted by ji...@apache.org.
Added MESOS-6852 to 1.1.1 CHANGELOG.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1279c3b0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1279c3b0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1279c3b0

Branch: refs/heads/1.1.x
Commit: 1279c3b08d62899ef93614e427c5164daa4cf41d
Parents: df69c4f
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Jan 11 12:42:23 2017 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jan 11 12:42:57 2017 -0800

----------------------------------------------------------------------
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/1279c3b0/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 9610bf8..2ba3861 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ All Issues:
   * [MESOS-6621] - SSL downgrade path will CHECK-fail when using both temporary and persistent sockets.
   * [MESOS-6676] - Always re-link with scheduler during re-registration.
   * [MESOS-6848] - The default executor does not exit if a single task pod fails.
+  * [MESOS-6852] - Nested container's launch command is not set correctly in docker/runtime isolator.
 
 
 Release Notes - Mesos - Version 1.1.0


[2/3] mesos git commit: Fixed docker runtime isolator argv issue for nested container.

Posted by ji...@apache.org.
Fixed docker runtime isolator argv issue for nested container.

For the nested container with docker runtime isolator, the `argv`
that should be appended to entrypoint[0] or cmd[0] are neglected.
This case refers to the 2nd row of the runtime isolator logic
table (sh=0, value=0, argv=1). This patch addresses the issue.

Review: https://reviews.apache.org/r/55412/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/822c7e8a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/822c7e8a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/822c7e8a

Branch: refs/heads/1.1.x
Commit: 822c7e8a045c4417412cb8d248c22aaedd3786fe
Parents: 6798ba8
Author: Gilbert Song <so...@gmail.com>
Authored: Wed Jan 11 09:01:24 2017 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jan 11 09:34:29 2017 -0800

----------------------------------------------------------------------
 .../mesos/isolators/docker/runtime.cpp          | 24 +++++---------------
 1 file changed, 6 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/822c7e8a/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 ccc2387..2d816e5 100644
--- a/src/slave/containerizer/mesos/isolators/docker/runtime.cpp
+++ b/src/slave/containerizer/mesos/isolators/docker/runtime.cpp
@@ -35,6 +35,8 @@
 using std::list;
 using std::string;
 
+using google::protobuf::RepeatedPtrField;
+
 using process::Failure;
 using process::Future;
 using process::Owned;
@@ -313,6 +315,7 @@ Result<CommandInfo> DockerRuntimeIsolatorProcess::getLaunchCommand(
 
     // Put user defined argv after default entrypoint argv
     // in sequence.
+    const RepeatedPtrField<string> arguments = command.arguments();
     command.clear_arguments();
     command.add_arguments(config.entrypoint(0));
 
@@ -321,15 +324,7 @@ Result<CommandInfo> DockerRuntimeIsolatorProcess::getLaunchCommand(
     }
 
     // Append all possible user argv after entrypoint arguments.
-    if (!containerConfig.has_task_info()) {
-      // Custom executor, default executor or nested container case.
-      command.mutable_arguments()->MergeFrom(
-          containerConfig.executor_info().command().arguments());
-    } else {
-      // Command task case.
-      command.mutable_arguments()->MergeFrom(
-          containerConfig.task_info().command().arguments());
-    }
+    command.mutable_arguments()->MergeFrom(arguments);
 
     // Overwrite default cmd arguments if CommandInfo arguments are
     // set by user. The logic below is the case that no argument is
@@ -343,19 +338,12 @@ Result<CommandInfo> DockerRuntimeIsolatorProcess::getLaunchCommand(
     command.set_value(config.cmd(0));
 
     // Put user defined argv after default cmd[0].
+    const RepeatedPtrField<string> arguments = command.arguments();
     command.clear_arguments();
     command.add_arguments(config.cmd(0));
 
     // Append all possible user argv after cmd[0].
-    if (!containerConfig.has_task_info()) {
-      // Custom executor, default executor or nested container case.
-      command.mutable_arguments()->MergeFrom(
-          containerConfig.executor_info().command().arguments());
-    } else {
-      // Command task case.
-      command.mutable_arguments()->MergeFrom(
-          containerConfig.task_info().command().arguments());
-    }
+    command.mutable_arguments()->MergeFrom(arguments);
 
     // Overwrite default cmd arguments if CommandInfo arguments
     // are set by user.