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/03/02 00:24:44 UTC
mesos git commit: Added more verbose logging in docker provisioner
store.
Repository: mesos
Updated Branches:
refs/heads/master 9f1b115a6 -> 18882493c
Added more verbose logging in docker provisioner store.
Review: https://reviews.apache.org/r/44164/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/18882493
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/18882493
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/18882493
Branch: refs/heads/master
Commit: 18882493cda192a02c79001d903359e8b43da670
Parents: 9f1b115
Author: Guangya Liu <gy...@gmail.com>
Authored: Tue Mar 1 14:44:00 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Mar 1 14:47:16 2016 -0800
----------------------------------------------------------------------
.../mesos/provisioner/docker/local_puller.cpp | 12 +++++++++++-
.../mesos/provisioner/docker/metadata_manager.cpp | 9 ++++++++-
.../mesos/provisioner/docker/registry_puller.cpp | 10 ++++++++++
3 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/18882493/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 ea4c2ff..74254c1 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
@@ -87,6 +87,9 @@ Try<Owned<Puller>> LocalPuller::create(const Flags& flags)
return Error("Expecting registry url starting with '/'");
}
+ VLOG(1) << "Creating local puller with docker registry '"
+ << flags.docker_registry << "'";
+
Owned<LocalPullerProcess> process(
new LocalPullerProcess(flags.docker_registry));
@@ -136,7 +139,8 @@ Future<vector<string>> LocalPullerProcess::pull(
stringify(reference) + "' at '" + tarPath + "'");
}
- VLOG(1) << "Untarring image from '" << tarPath
+ VLOG(1) << "Untarring image '" << reference
+ << "' from '" << tarPath
<< "' to '" << directory << "'";
return command::untar(Path(tarPath), Path(directory))
@@ -155,6 +159,9 @@ Future<vector<string>> LocalPullerProcess::_pull(
return Failure("Failed to read 'repositories': " + _repositories.error());
}
+ VLOG(1) << "The repositories JSON file for image '" << reference
+ << "' is '" << _repositories.get() << "'";
+
Try<JSON::Object> repositories =
JSON::parse<JSON::Object>(_repositories.get());
@@ -272,6 +279,9 @@ Future<Nothing> LocalPullerProcess::extractLayer(
const string tar = paths::getImageLayerTarPath(layerPath);
const string rootfs = paths::getImageLayerRootfsPath(layerPath);
+ VLOG(1) << "Extracting layer tar ball '" << tar
+ << " to rootfs '" << rootfs << "'";
+
Try<Nothing> mkdir = os::mkdir(rootfs);
if (mkdir.isError()) {
return Failure(
http://git-wip-us.apache.org/repos/asf/mesos/blob/18882493/src/slave/containerizer/mesos/provisioner/docker/metadata_manager.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/metadata_manager.cpp b/src/slave/containerizer/mesos/provisioner/docker/metadata_manager.cpp
index f391a94..cf630cc 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/metadata_manager.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/metadata_manager.cpp
@@ -145,6 +145,8 @@ Future<Image> MetadataManagerProcess::put(
return Failure("Failed to save state of Docker images: " + status.error());
}
+ VLOG(1) << "Successfully cached image '" << imageReference << "'";
+
return dockerImage;
}
@@ -154,6 +156,8 @@ Future<Option<Image>> MetadataManagerProcess::get(
{
const string imageReference = stringify(reference);
+ VLOG(1) << "Looking for image '" << imageReference << "'";
+
if (!storedImages.contains(imageReference)) {
return None();
}
@@ -227,9 +231,12 @@ Future<Nothing> MetadataManagerProcess::recover()
} else {
storedImages[imageReference] = image;
}
+
+ VLOG(1) << "Successfully loaded image '" << imageReference << "'";
}
- LOG(INFO) << "Loaded " << storedImages.size() << " Docker images";
+ LOG(INFO) << "Successfully loaded " << storedImages.size()
+ << " Docker images";
return Nothing();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/18882493/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp b/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
index 3fd58f6..6d637ed 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
@@ -108,6 +108,9 @@ Try<Owned<Puller>> RegistryPuller::create(
defaultRegistryUrl.error());
}
+ VLOG(1) << "Creating registry puller with docker registry '"
+ << flags.docker_registry << "'";
+
Owned<RegistryPullerProcess> process(
new RegistryPullerProcess(
flags.docker_store_dir,
@@ -188,6 +191,10 @@ Future<vector<string>> RegistryPullerProcess::pull(
port);
}
+ VLOG(1) << "Pulling image '" << reference
+ << "' from '" << manifestUri
+ << "' to '" << directory << "'";
+
return fetcher->fetch(manifestUri, directory)
.then(defer(self(), &Self::_pull, reference, directory));
}
@@ -254,6 +261,9 @@ Future<vector<string>> RegistryPullerProcess::__pull(
const string rootfs = paths::getImageLayerRootfsPath(layerPath);
const string json = paths::getImageLayerManifestPath(layerPath);
+ VLOG(1) << "Extracting layer tar ball '" << tar
+ << " to rootfs '" << rootfs << "'";
+
// NOTE: This will create 'layerPath' as well.
Try<Nothing> mkdir = os::mkdir(rootfs, true);
if (mkdir.isError()) {