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/02e32c9e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/02e32c9e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/02e32c9e Branch: refs/heads/1.5.x Commit: 02e32c9ea5a5de25235f15df9a26cffa61297e8c Parents: 42ab3f6 Author: Greg Mann <g...@mesosphere.io> Authored: Fri Feb 23 16:41:46 2018 -0800 Committer: Gilbert Song <songzihao1...@gmail.com> Committed: Wed Mar 7 01:08:12 2018 -0800 ---------------------------------------------------------------------- src/docker/docker.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/02e32c9e/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index 3f20900..6013707 100644 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -1163,7 +1163,8 @@ Future<Nothing> Docker::stop( containerName, cmd, s.get(), - remove)); + remove)) + .onDiscard(lambda::bind(&commandDiscarded, s.get(), cmd)); } @@ -1581,7 +1582,8 @@ Future<Docker::Image> Docker::pull( path, socket, config, - output)); + output)) + .onDiscard(lambda::bind(&commandDiscarded, s.get(), cmd)); }
