Renamed a function parameter in Docker puller. Review: https://reviews.apache.org/r/41237
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c50f332e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c50f332e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c50f332e Branch: refs/heads/master Commit: c50f332eb8e22fec8d1dd54b57626f04e99003d9 Parents: b32ccac Author: Jie Yu <[email protected]> Authored: Thu Dec 10 18:01:09 2015 -0800 Committer: Jie Yu <[email protected]> Committed: Fri Dec 11 12:19:29 2015 -0800 ---------------------------------------------------------------------- src/slave/containerizer/mesos/provisioner/docker/puller.cpp | 4 ++-- src/slave/containerizer/mesos/provisioner/docker/puller.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c50f332e/src/slave/containerizer/mesos/provisioner/docker/puller.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/provisioner/docker/puller.cpp b/src/slave/containerizer/mesos/provisioner/docker/puller.cpp index a8936e3..7e830bc 100644 --- a/src/slave/containerizer/mesos/provisioner/docker/puller.cpp +++ b/src/slave/containerizer/mesos/provisioner/docker/puller.cpp @@ -128,7 +128,7 @@ Future<Nothing> untar(const string& file, const string& directory) Future<pair<string, string>> untarLayer( - const string& layerPath, + const string& file, const string& directory, const string& layerId) { @@ -161,7 +161,7 @@ Future<pair<string, string>> untarLayer( } // The tar file will be removed when the staging directory is removed. - return untar(layerPath, localRootfsPath) + return untar(file, localRootfsPath) .then([directory, layerId]() -> Future<pair<string, string>> { const string rootfsPath = paths::getImageArchiveLayerRootfsPath(directory, layerId); http://git-wip-us.apache.org/repos/asf/mesos/blob/c50f332e/src/slave/containerizer/mesos/provisioner/docker/puller.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/provisioner/docker/puller.hpp b/src/slave/containerizer/mesos/provisioner/docker/puller.hpp index 31bcc86..d12b3d0 100644 --- a/src/slave/containerizer/mesos/provisioner/docker/puller.hpp +++ b/src/slave/containerizer/mesos/provisioner/docker/puller.hpp @@ -79,12 +79,12 @@ process::Future<Nothing> untar( * |-- <layer_id> * |-- rootfs * - * @param layerPath path to the tar file holding the Docker layer. + * @param file path to the tar file holding the Docker layer. * @param directory staging directory. * @return layer Id mapping to the rootfs path of the layer. */ process::Future<std::pair<std::string, std::string>> untarLayer( - const std::string& layerPath, + const std::string& file, const std::string& directory, const std::string& layerId);
