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/03/07 09:15:01 UTC
[07/12] mesos git commit: Ensured that Docker containerizer returns a
failed Future in one case.
Ensured that Docker containerizer returns a failed Future in one case.
Because the Docker library did not immediately transition the
Future returned by `inspect()` to DISCARDED, it was safe for the
Docker containerizer to discard this Future before failing the
Promise associated with the Future returned by `launch()`.
However, the introduction of an `onDiscard` callback in
`Docker::inspect()` makes this assumption invalid. This patch
addresses this by failing the Promise before discarding the
Future.
Review: https://reviews.apache.org/r/65743/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/57cd3c34
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/57cd3c34
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/57cd3c34
Branch: refs/heads/1.4.x
Commit: 57cd3c3467d3c6923fcc22dd3b491da3f5dd8ad8
Parents: 12d12e4
Author: Greg Mann <gr...@mesosphere.io>
Authored: Tue Feb 27 16:42:10 2018 -0800
Committer: Gilbert Song <so...@gmail.com>
Committed: Mon Mar 5 18:11:12 2018 -0800
----------------------------------------------------------------------
src/slave/containerizer/docker.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/57cd3c34/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index 4db76df..e261a42 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -1427,15 +1427,15 @@ Future<Docker::Container> DockerContainerizerProcess::launchExecutorContainer(
run.onAny([=]() mutable {
if (!run.isReady()) {
- inspect.discard();
promise->fail(run.isFailed() ? run.failure() : "discarded");
- } else if (run->isNone()) {
inspect.discard();
+ } else if (run->isNone()) {
promise->fail("Failed to obtain exit status of container");
+ inspect.discard();
} else {
if (!WSUCCEEDED(run->get())) {
- inspect.discard();
promise->fail("Container " + WSTRINGIFY(run->get()));
+ inspect.discard();
}
// TODO(bmahler): Handle the case where the 'run' exits