You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gi...@apache.org on 2018/05/07 21:18:17 UTC

[1/2] mesos git commit: Added MESOS-8876 to 1.3.3 CHANGELOG.

Repository: mesos
Updated Branches:
  refs/heads/1.3.x 770ec58bb -> eb9f01538


Added MESOS-8876 to 1.3.3 CHANGELOG.


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

Branch: refs/heads/1.3.x
Commit: eb9f01538c9ed10604642b3696d54c3b75d6f7db
Parents: bcfbc02
Author: Gilbert Song <so...@gmail.com>
Authored: Mon May 7 14:14:00 2018 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Mon May 7 14:16:31 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/mesos/blob/eb9f0153/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index f9ea20a..052a475 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ All Issues:
   * [MESOS-8576] - Improve discard handling of 'Docker::inspect()'.
   * [MESOS-8605] - Terminal task status update will not send if 'docker inspect' is hung.
   * [MESOS-8651] - Potential memory leaks in the `volume/sandbox_path` isolator.
+  * [MESOS-8876] - Normal exit of Docker container using rexray volume results in TASK_FAILED.
 
 
 Release Notes - Mesos - Version 1.3.2


[2/2] mesos git commit: Increased the timeout for waiting for `reaped` to be invoked.

Posted by gi...@apache.org.
Increased the timeout for waiting for `reaped` to be invoked.

Previously after the container process is reaped by the Docker
executor, we will wait 3 seconds for `reaped` to be invoked.
However in some cases (e.g., launch a Docker container to use
an external rexray volume), there will be more than 3 seconds
after the container process exits and before the `docker run`
command returns (i.e., `reaped` invoked). So in this patch,
the timeout is increased to 60 seconds.

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


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

Branch: refs/heads/1.3.x
Commit: bcfbc020189b50fb62a860d6897c58746bd708ea
Parents: 770ec58
Author: Qian Zhang <zh...@gmail.com>
Authored: Mon May 7 13:48:39 2018 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Mon May 7 14:16:31 2018 -0700

----------------------------------------------------------------------
 src/docker/executor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/bcfbc020/src/docker/executor.cpp
----------------------------------------------------------------------
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index 44d8212..bf0e933 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -302,11 +302,11 @@ public:
               // lambda; ideally when the Docker issue mentioned above does
               // not occur, `reaped` will be invoked (i.e., the `docker run`
               // command returns) to get the actual exit status of the
-              // container, so here we wait a few seconds for `reaped` to be
+              // container, so here we wait 60 seconds for `reaped` to be
               // invoked. If `reaped` is not invoked within the timeout, that
               // means we hit that Docker issue.
               delay(
-                  Seconds(3),
+                  Seconds(60),
                   self(),
                   &Self::reapedContainer,
                   container.pid.get());
@@ -315,10 +315,10 @@ public:
             }));
         } else {
           // This is the case that the container process has already exited,
-          // Similar to the above case, let's wait a few seconds for `reaped`
+          // Similar to the above case, let's wait 60 seconds for `reaped`
           // to be invoked.
           delay(
-              Seconds(3),
+              Seconds(60),
               self(),
               &Self::reapedContainer,
               None());