You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/02/20 06:52:23 UTC
[3/3] mesos git commit: Combined two onAny together in docker store.
Combined two onAny together in docker store.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fdeb55a0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fdeb55a0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fdeb55a0
Branch: refs/heads/master
Commit: fdeb55a0afa7e507c4426b57e235f79085da7b72
Parents: db985e5
Author: Jie Yu <yu...@gmail.com>
Authored: Fri Feb 19 12:05:06 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Feb 19 21:50:52 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/provisioner/docker/store.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/fdeb55a0/src/slave/containerizer/mesos/provisioner/docker/store.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/store.cpp b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
index e7dd54a..2f1d3e0 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/store.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
@@ -210,16 +210,15 @@ Future<Image> StoreProcess::_get(
Future<Image> future = puller->pull(reference, Path(staging.get()))
.then(defer(self(), &Self::moveLayers, lambda::_1))
.then(defer(self(), &Self::storeImage, reference, lambda::_1))
- .onAny(defer(self(), [this, imageReference](const Future<Image>&) {
+ .onAny(defer(self(), [=](const Future<Image>&) {
pulling.erase(imageReference);
- }))
- .onAny([staging, imageReference]() {
+
Try<Nothing> rmdir = os::rmdir(staging.get());
if (rmdir.isError()) {
LOG(WARNING) << "Failed to remove staging directory: "
<< rmdir.error();
}
- });
+ }));
promise->associate(future);
pulling[imageReference] = promise;