Repository: mesos Updated Branches: refs/heads/master 8949b1a10 -> 6ae0f80b3
Renamed appc_backend flag to appc_provisioner_backend. Review: https://reviews.apache.org/r/38240 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3b2d9290 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3b2d9290 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3b2d9290 Branch: refs/heads/master Commit: 3b2d92906c969a7e7a47569a7cc00fbc8985c683 Parents: 0636f2b Author: Jiang Yan Xu <[email protected]> Authored: Wed Sep 9 16:29:32 2015 -0700 Committer: Jiang Yan Xu <[email protected]> Committed: Thu Sep 10 10:42:06 2015 -0700 ---------------------------------------------------------------------- .../provisioners/appc/provisioner.cpp | 17 ++++++++++------- src/slave/flags.cpp | 4 ++-- src/slave/flags.hpp | 2 +- src/tests/containerizer/appc_provisioner_tests.cpp | 4 ++-- 4 files changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/3b2d9290/src/slave/containerizer/provisioners/appc/provisioner.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/provisioners/appc/provisioner.cpp b/src/slave/containerizer/provisioners/appc/provisioner.cpp index 5204cbc..aa4db48 100644 --- a/src/slave/containerizer/provisioners/appc/provisioner.cpp +++ b/src/slave/containerizer/provisioners/appc/provisioner.cpp @@ -129,9 +129,9 @@ Try<Owned<Provisioner>> AppcProvisioner::create( return Error("No usable provisioner backend created"); } - if (!backends.contains(flags.appc_backend)) { - return Error("The specified provisioner backend '" + flags.appc_backend + - "'is unsupported"); + if (!backends.contains(flags.appc_provisioner_backend)) { + return Error("The specified provisioner backend '" + + flags.appc_provisioner_backend + "'is unsupported"); } return Owned<Provisioner>(new AppcProvisioner( @@ -310,13 +310,14 @@ Future<string> AppcProvisionerProcess::provision( string rootfsId = UUID::random().toString(); string rootfs = provisioners::paths::getContainerRootfsDir( - root, containerId, flags.appc_backend, rootfsId); + root, containerId, flags.appc_provisioner_backend, rootfsId); if (!infos.contains(containerId)) { infos.put(containerId, Owned<Info>(new Info())); } - infos[containerId]->rootfses[flags.appc_backend].put(rootfsId, rootfs); + infos[containerId]->rootfses[flags.appc_provisioner_backend].put( + rootfsId, rootfs); // Get and then provision image layers from the store. return store->get(image.appc()) @@ -330,8 +331,10 @@ Future<string> AppcProvisionerProcess::_provision( { LOG(INFO) << "Provisioning image layers to rootfs '" << rootfs << "'"; - CHECK(backends.contains(flags.appc_backend)); - return backends.get(flags.appc_backend).get()->provision(layers, rootfs) + CHECK(backends.contains(flags.appc_provisioner_backend)); + return backends.get(flags.appc_provisioner_backend).get()->provision( + layers, + rootfs) .then([rootfs]() -> Future<string> { return rootfs; }); } http://git-wip-us.apache.org/repos/asf/mesos/blob/3b2d9290/src/slave/flags.cpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp index 7539441..b676bac 100644 --- a/src/slave/flags.cpp +++ b/src/slave/flags.cpp @@ -69,8 +69,8 @@ mesos::internal::slave::Flags::Flags() "Directory the appc provisioner will store images in", "/tmp/mesos/store/appc"); - add(&Flags::appc_backend, - "appc_backend", + add(&Flags::appc_provisioner_backend, + "appc_provisioner_backend", "Strategy for provisioning container rootfs from appc images", "copy"); http://git-wip-us.apache.org/repos/asf/mesos/blob/3b2d9290/src/slave/flags.hpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp index b8335aa..799c963 100644 --- a/src/slave/flags.hpp +++ b/src/slave/flags.hpp @@ -50,7 +50,7 @@ public: Option<std::string> provisioners; std::string appc_store_dir; - std::string appc_backend; + std::string appc_provisioner_backend; std::string default_role; Option<std::string> attributes; http://git-wip-us.apache.org/repos/asf/mesos/blob/3b2d9290/src/tests/containerizer/appc_provisioner_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/appc_provisioner_tests.cpp b/src/tests/containerizer/appc_provisioner_tests.cpp index f30e1a1..34748b1 100644 --- a/src/tests/containerizer/appc_provisioner_tests.cpp +++ b/src/tests/containerizer/appc_provisioner_tests.cpp @@ -196,7 +196,7 @@ TEST_F(AppcProvisionerTest, ROOT_Provision) // Create provisioner. slave::Flags flags; flags.appc_store_dir = path::join(os::getcwd(), "store"); - flags.appc_backend = "bind"; + flags.appc_provisioner_backend = "bind"; flags.provisioners = "appc"; flags.work_dir = "work_dir"; @@ -276,7 +276,7 @@ TEST_F(AppcProvisionerTest, ROOT_Provision) "containers", containerId.value(), "backends", - flags.appc_backend, + flags.appc_provisioner_backend, "rootfses")); ASSERT_SOME(rootfses);
