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/01/14 23:46:21 UTC
[3/7] mesos git commit: Cleaned up unnecessary parameter in
provisioner constructor.
Cleaned up unnecessary parameter in provisioner constructor.
Review: https://reviews.apache.org/r/41999/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5558982c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5558982c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5558982c
Branch: refs/heads/master
Commit: 5558982cead26fd2dd5de7f3dcebf092036e2784
Parents: 4208a53
Author: Gilbert Song <so...@gmail.com>
Authored: Thu Jan 14 13:20:31 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Jan 14 14:45:43 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/containerizer.cpp | 2 +-
src/slave/containerizer/mesos/provisioner/provisioner.cpp | 4 +---
src/slave/containerizer/mesos/provisioner/provisioner.hpp | 4 +---
src/tests/containerizer/provisioner_appc_tests.cpp | 6 +++---
4 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5558982c/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index f3c370a..ce02523 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -180,7 +180,7 @@ Try<MesosContainerizer*> MesosContainerizer::create(
#ifdef __linux__
// The provisioner will be used by the 'filesystem/linux' isolator.
- Try<Owned<Provisioner>> provisioner = Provisioner::create(flags_, fetcher);
+ Try<Owned<Provisioner>> provisioner = Provisioner::create(flags_);
if (provisioner.isError()) {
return Error("Failed to create provisioner: " + provisioner.error());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/5558982c/src/slave/containerizer/mesos/provisioner/provisioner.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/provisioner.cpp b/src/slave/containerizer/mesos/provisioner/provisioner.cpp
index 89d06e9..023f736 100644
--- a/src/slave/containerizer/mesos/provisioner/provisioner.cpp
+++ b/src/slave/containerizer/mesos/provisioner/provisioner.cpp
@@ -47,9 +47,7 @@ namespace mesos {
namespace internal {
namespace slave {
-Try<Owned<Provisioner>> Provisioner::create(
- const Flags& flags,
- Fetcher* fetcher)
+Try<Owned<Provisioner>> Provisioner::create(const Flags& flags)
{
string _rootDir = slave::paths::getProvisionerDir(flags.work_dir);
http://git-wip-us.apache.org/repos/asf/mesos/blob/5558982c/src/slave/containerizer/mesos/provisioner/provisioner.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/provisioner.hpp b/src/slave/containerizer/mesos/provisioner/provisioner.hpp
index b2e23d8..4202f55 100644
--- a/src/slave/containerizer/mesos/provisioner/provisioner.hpp
+++ b/src/slave/containerizer/mesos/provisioner/provisioner.hpp
@@ -61,9 +61,7 @@ class Provisioner
{
public:
// Create the provisioner based on the specified flags.
- static Try<process::Owned<Provisioner>> create(
- const Flags& flags,
- Fetcher* fetcher);
+ static Try<process::Owned<Provisioner>> create(const Flags& flags);
// Available only for testing.
explicit Provisioner(process::Owned<ProvisionerProcess> process);
http://git-wip-us.apache.org/repos/asf/mesos/blob/5558982c/src/tests/containerizer/provisioner_appc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_appc_tests.cpp b/src/tests/containerizer/provisioner_appc_tests.cpp
index 98d5a46..e3d08d9 100644
--- a/src/tests/containerizer/provisioner_appc_tests.cpp
+++ b/src/tests/containerizer/provisioner_appc_tests.cpp
@@ -214,7 +214,7 @@ TEST_F(ProvisionerAppcTest, ROOT_Provision)
Fetcher fetcher;
- Try<Owned<Provisioner>> provisioner = Provisioner::create(flags, &fetcher);
+ Try<Owned<Provisioner>> provisioner = Provisioner::create(flags);
ASSERT_SOME(provisioner);
// Create a simple image in the store:
@@ -325,7 +325,7 @@ TEST_F(ProvisionerAppcTest, Recover)
flags.work_dir = "work_dir";
Fetcher fetcher;
- Try<Owned<Provisioner>> provisioner1 = Provisioner::create(flags, &fetcher);
+ Try<Owned<Provisioner>> provisioner1 = Provisioner::create(flags);
ASSERT_SOME(provisioner1);
// Create a simple image in the store:
@@ -371,7 +371,7 @@ TEST_F(ProvisionerAppcTest, Recover)
AWAIT_READY(provisionInfo);
// Create a new provisioner to recover the state from the container.
- Try<Owned<Provisioner>> provisioner2 = Provisioner::create(flags, &fetcher);
+ Try<Owned<Provisioner>> provisioner2 = Provisioner::create(flags);
ASSERT_SOME(provisioner2);
mesos::slave::ContainerState state;