Updated discard handling for Docker 'stop' and 'pull' commands. Review: https://reviews.apache.org/r/65787/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6d8b9b77 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6d8b9b77 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6d8b9b77 Branch: refs/heads/1.3.x Commit: 6d8b9b77f45670fae22b33da1e6fd5a41569b46d Parents: 7eb4f1b Author: Greg Mann <g...@mesosphere.io> Authored: Fri Feb 23 16:41:46 2018 -0800 Committer: Gilbert Song <songzihao1...@gmail.com> Committed: Fri Mar 2 16:57:31 2018 -0800 ---------------------------------------------------------------------- src/docker/docker.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/6d8b9b77/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index 3f99293..d046b5a 100755 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -972,7 +972,8 @@ Future<Nothing> Docker::stop( containerName, cmd, s.get(), - remove)); + remove)) + .onDiscard(lambda::bind(&commandDiscarded, s.get(), cmd)); } Future<Nothing> Docker::_stop( @@ -1388,7 +1389,8 @@ Future<Docker::Image> Docker::pull( path, socket, config, - output)); + output)) + .onDiscard(lambda::bind(&commandDiscarded, s.get(), cmd)); }
