You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ya...@apache.org on 2015/09/04 02:30:13 UTC
[2/3] mesos git commit: Changed the Appc provisioner directory to
identify a rootfs by a rootfs_id (UUID).
Changed the Appc provisioner directory to identify a rootfs by a rootfs_id (UUID).
- So the user can provision multiple identical rootfses in the volumes of one container, a case we don't need to disallow.
- Previously a rootfs is identified by the 'image_id' of its topmost file system layer.
Review: https://reviews.apache.org/r/37880
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d45ccc5d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d45ccc5d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d45ccc5d
Branch: refs/heads/master
Commit: d45ccc5d14da54b6768161378146723c9603147f
Parents: eeb4227
Author: Jiang Yan Xu <ya...@jxu.me>
Authored: Wed Aug 26 15:24:04 2015 -0700
Committer: Jiang Yan Xu <ya...@jxu.me>
Committed: Thu Sep 3 17:29:16 2015 -0700
----------------------------------------------------------------------
src/slave/containerizer/provisioners/appc/paths.cpp | 4 ++--
src/slave/containerizer/provisioners/appc/paths.hpp | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d45ccc5d/src/slave/containerizer/provisioners/appc/paths.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/provisioners/appc/paths.cpp b/src/slave/containerizer/provisioners/appc/paths.cpp
index 3113c84..271116d 100644
--- a/src/slave/containerizer/provisioners/appc/paths.cpp
+++ b/src/slave/containerizer/provisioners/appc/paths.cpp
@@ -80,7 +80,7 @@ string getContainerRootfsDir(
const Image::Type& imageType,
const ContainerID& containerId,
const string& backend,
- const string& imageId)
+ const string& rootfsId)
{
return path::join(
slave::paths::getProvisionerDir(rootDir, imageType),
@@ -89,7 +89,7 @@ string getContainerRootfsDir(
"backends",
backend,
"rootfses",
- imageId);
+ rootfsId);
}
} // namespace paths {
http://git-wip-us.apache.org/repos/asf/mesos/blob/d45ccc5d/src/slave/containerizer/provisioners/appc/paths.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/provisioners/appc/paths.hpp b/src/slave/containerizer/provisioners/appc/paths.hpp
index 41e3bf7..6364737 100644
--- a/src/slave/containerizer/provisioners/appc/paths.hpp
+++ b/src/slave/containerizer/provisioners/appc/paths.hpp
@@ -55,14 +55,14 @@ namespace paths {
// |-- backends
// |-- <backend> (copy, bind, etc.)
// |-- rootfses
-// |-- <image_id> (the rootfs)
+// |-- <rootfs_id> (the rootfs)
//
// NOTE: Each container could have multiple image types, therefore there
// can be the same <container_id> directory under other provisioners e.g.,
// <work_dir>/provisioners/DOCKER, etc. Under each provisioner + container
// there can be multiple backends due to the change of backend flags. For
-// appc, under each backend a rootfs is identified by the 'image_id' of
-// the topmost filesystem layer.
+// appc, under each backend a rootfs is identified by the 'rootfs_id' which
+// is a UUID.
std::string getStagingDir(const std::string& storeDir);
@@ -96,7 +96,7 @@ std::string getContainerRootfsDir(
const Image::Type& imageType,
const ContainerID& containerId,
const std::string& backend,
- const std::string& imageId);
+ const std::string& rootfsId);
} // namespace paths {
} // namespace appc {