Repository: mesos Updated Branches: refs/heads/1.4.x 2b97ba53b -> 84c97007c
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/12d12e42 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/12d12e42 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/12d12e42 Branch: refs/heads/1.4.x Commit: 12d12e4275f7b95917ac6f433b7e6a4f95b34858 Parents: e26355f 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:55:50 2018 -0800 ---------------------------------------------------------------------- src/docker/docker.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/12d12e42/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index f0dbd8d..9ab716f 100755 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -1143,7 +1143,8 @@ Future<Nothing> Docker::stop( containerName, cmd, s.get(), - remove)); + remove)) + .onDiscard(lambda::bind(&commandDiscarded, s.get(), cmd)); } @@ -1561,7 +1562,8 @@ Future<Docker::Image> Docker::pull( path, socket, config, - output)); + output)) + .onDiscard(lambda::bind(&commandDiscarded, s.get(), cmd)); }
