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/a20a3177 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a20a3177 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a20a3177 Branch: refs/heads/master Commit: a20a317765d4c577e3d7140e4d7a9b7c5bc85a56 Parents: 9a414ab Author: Greg Mann <g...@mesosphere.io> Authored: Fri Feb 23 16:41:46 2018 -0800 Committer: Greg Mann <gregorywm...@gmail.com> Committed: Fri Feb 23 17:44:53 2018 -0800 ---------------------------------------------------------------------- src/docker/docker.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/a20a3177/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index 4c4c198..f7a4466 100644 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -1194,7 +1194,8 @@ Future<Nothing> Docker::stop( containerName, cmd, s.get(), - remove)); + remove)) + .onDiscard(lambda::bind(&commandDiscarded, s.get(), cmd)); } @@ -1612,7 +1613,8 @@ Future<Docker::Image> Docker::pull( path, socket, config, - output)); + output)) + .onDiscard(lambda::bind(&commandDiscarded, s.get(), cmd)); }
