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:17:55 UTC
[1/2] mesos git commit: Added MESOS-8876 to 1.4.2 CHANGELOG.
Repository: mesos
Updated Branches:
refs/heads/1.4.x 35fcdd778 -> 7e78618c6
Added MESOS-8876 to 1.4.2 CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7e78618c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7e78618c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7e78618c
Branch: refs/heads/1.4.x
Commit: 7e78618c6415fe3a419428b148c546f7c379ef1a
Parents: f7892ea
Author: Gilbert Song <so...@gmail.com>
Authored: Mon May 7 14:13:42 2018 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Mon May 7 14:16:09 2018 -0700
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7e78618c/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 1807b29..92793e2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@ Release Notes - Mesos - Version 1.4.2 (WIP)
* [MESOS-8604] - Quota headroom tracking may be incorrect in the presence of hierarchical reservation.
* [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.4.1
[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/f7892eaf
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f7892eaf
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f7892eaf
Branch: refs/heads/1.4.x
Commit: f7892eafb17d62043006bdf81c8765b5a8438531
Parents: 35fcdd7
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:09 2018 -0700
----------------------------------------------------------------------
src/docker/executor.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f7892eaf/src/docker/executor.cpp
----------------------------------------------------------------------
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index 4b5f257..a6a5d64 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -306,11 +306,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());
@@ -319,10 +319,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());