Refactor docker provisioner paths.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c5537a13 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c5537a13 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c5537a13 Branch: refs/heads/master Commit: c5537a1331875d3e52f8b9c7e41350dfb8120fc1 Parents: f96e0df Author: Timothy Chen <[email protected]> Authored: Fri Sep 4 18:09:51 2015 -0700 Committer: Timothy Chen <[email protected]> Committed: Fri Sep 25 09:02:05 2015 -0700 ---------------------------------------------------------------------- .../containerizer/provisioners/docker/paths.cpp | 2 +- .../containerizer/provisioners/docker/paths.hpp | 16 +++++++--------- src/slave/flags.cpp | 6 ------ src/slave/flags.hpp | 1 - 4 files changed, 8 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c5537a13/src/slave/containerizer/provisioners/docker/paths.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/provisioners/docker/paths.cpp b/src/slave/containerizer/provisioners/docker/paths.cpp index ca35e0a..5a54ba1 100644 --- a/src/slave/containerizer/provisioners/docker/paths.cpp +++ b/src/slave/containerizer/provisioners/docker/paths.cpp @@ -82,7 +82,7 @@ string getImageLayerPath( const string& storeDir, const string& layerId) { - return path::join(storeDir, layerId); + return path::join(storeDir, "layers", layerId); } string getImageLayerRootfsPath( http://git-wip-us.apache.org/repos/asf/mesos/blob/c5537a13/src/slave/containerizer/provisioners/docker/paths.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/provisioners/docker/paths.hpp b/src/slave/containerizer/provisioners/docker/paths.hpp index 4aae0d0..0ad3b74 100644 --- a/src/slave/containerizer/provisioners/docker/paths.hpp +++ b/src/slave/containerizer/provisioners/docker/paths.hpp @@ -32,15 +32,13 @@ namespace paths { /** * The Docker store file system layout is as follows: - * <root> - * |-- Local image discovery dir ('--docker_discovery_local_dir' slave flag) - * |--<name>.tar - * | - * |-- Image store dir ('--docker_store_dir' slave flag) - * |--staging - * |--<image_id> - * |--rootfs - * |--storedImages + * Image store dir ('--docker_store_dir' slave flag) + * |--staging (contains temp directories for downloads and extract) + * |--layers + * |--<layer_id> + * |--rootfs + * |--rootfses + * |--storedImages (file holding on cached images) */ std::string getStagingDir(const std::string& storeDir); http://git-wip-us.apache.org/repos/asf/mesos/blob/c5537a13/src/slave/flags.cpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp index 3ce787f..b0af3d8 100644 --- a/src/slave/flags.cpp +++ b/src/slave/flags.cpp @@ -103,12 +103,6 @@ mesos::internal::slave::Flags::Flags() "Strategy for docker provisioning container rootfs from images", "copy"); - add(&Flags::docker_rootfs_dir, - "docker_rootfs_dir", - "Directory the docker provisioner will store container root\n" - "filesystems in", - "/tmp/mesos/containers/docker"); - add(&Flags::docker_discovery_local_dir, "docker_discovery_local_dir", "Directory for docker provisioner to look in for local images", http://git-wip-us.apache.org/repos/asf/mesos/blob/c5537a13/src/slave/flags.hpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp index 7df8062..758d495 100644 --- a/src/slave/flags.hpp +++ b/src/slave/flags.hpp @@ -56,7 +56,6 @@ public: std::string docker_store; std::string docker_store_dir; std::string docker_backend; - std::string docker_rootfs_dir; std::string docker_discovery_local_dir; std::string default_role; Option<std::string> attributes;
