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:21 UTC
[1/3] mesos git commit: Added a TODO about handling slashs in image
reference.
Repository: mesos
Updated Branches:
refs/heads/master 2ec9aa3f4 -> fdeb55a0a
Added a TODO about handling slashs in image reference.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/42a07ffb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/42a07ffb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/42a07ffb
Branch: refs/heads/master
Commit: 42a07ffb88ceb44268f13a9d09b93c76114db6a9
Parents: 2ec9aa3
Author: Jie Yu <yu...@gmail.com>
Authored: Fri Feb 19 11:37:44 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Feb 19 21:50:51 2016 -0800
----------------------------------------------------------------------
.../containerizer/mesos/provisioner/docker/local_puller.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/42a07ffb/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp b/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
index c980e44..3957651 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
@@ -116,13 +116,16 @@ Future<list<pair<string, string>>> LocalPullerProcess::pull(
const spec::ImageReference& reference,
const string& directory)
{
+ // TODO(jieyu): We need to handle the case where the image reference
+ // contains a slash '/'.
const string tarPath = paths::getImageArchiveTarPath(
archivesDir,
stringify(reference));
if (!os::exists(tarPath)) {
- return Failure("Failed to find archive for image '" + stringify(reference) +
- "' at '" + tarPath + "'");
+ return Failure(
+ "Failed to find archive for image '" +
+ stringify(reference) + "' at '" + tarPath + "'");
}
VLOG(1) << "Untarring image from '" << tarPath
[2/3] mesos git commit: Used untar from command utils in local docker
store.
Posted by ji...@apache.org.
Used untar from command utils in local docker store.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/db985e5b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/db985e5b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/db985e5b
Branch: refs/heads/master
Commit: db985e5b37338d54453100df6797973bb902142c
Parents: 42a07ff
Author: Jie Yu <yu...@gmail.com>
Authored: Fri Feb 19 11:38:17 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Feb 19 21:50:52 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/db985e5b/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp b/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
index 3957651..f3e7c04 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
@@ -31,6 +31,7 @@
#include <process/subprocess.hpp>
#include "common/status_utils.hpp"
+#include "common/command_utils.hpp"
#include "slave/containerizer/mesos/provisioner/docker/local_puller.hpp"
#include "slave/containerizer/mesos/provisioner/docker/paths.hpp"
@@ -131,7 +132,7 @@ Future<list<pair<string, string>>> LocalPullerProcess::pull(
VLOG(1) << "Untarring image from '" << tarPath
<< "' to '" << directory << "'";
- return untar(tarPath, directory)
+ return command::untar(Path(tarPath), Path(directory))
.then(defer(self(), &Self::putImage, reference, directory));
}
[3/3] mesos git commit: Combined two onAny together in docker store.
Posted by ji...@apache.org.
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;