You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2017/11/20 00:54:24 UTC
[13/15] mesos git commit: Used Future::recover in Mesos.
Used Future::recover in Mesos.
Review: https://reviews.apache.org/r/61151
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b8958e0a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b8958e0a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b8958e0a
Branch: refs/heads/master
Commit: b8958e0a3b6b9894d427dd4f9d67a8e80808b96e
Parents: 613a846
Author: Benjamin Hindman <be...@gmail.com>
Authored: Sat Jan 7 23:05:15 2017 -0800
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sun Nov 19 16:51:26 2017 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/io/switchboard.cpp | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b8958e0a/src/slave/containerizer/mesos/io/switchboard.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/io/switchboard.cpp b/src/slave/containerizer/mesos/io/switchboard.cpp
index 63d3cf8..8a00e6d 100644
--- a/src/slave/containerizer/mesos/io/switchboard.cpp
+++ b/src/slave/containerizer/mesos/io/switchboard.cpp
@@ -1634,16 +1634,11 @@ Future<http::Response> IOSwitchboardServerProcess::attachContainerInput(
-> ControlFlow<http::Response> {
return Continue();
}))
- // TODO(benh):
- // .recover(defer(self(), [=](...) {
- // failure = Failure("Failed writing to stdin: discarded");
- // return Break(http::InternalServerError(failure->message));
- // }))
- .repair(defer(self(), [=](
+ .recover(defer(self(), [=](
const Future<ControlFlow<http::Response>>& future)
-> ControlFlow<http::Response> {
failure = Failure(
- "Failed writing to stdin: " + future.failure());
+ "Failed writing to stdin: " + stringify(future));
return Break(http::InternalServerError(failure->message));
}));
}