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/08/22 20:46:37 UTC
[08/12] mesos git commit: Changed the provisioner
recover/provision/destroy to be const methods.
Changed the provisioner recover/provision/destroy to be const methods.
This is necessary for updating the provisioner as a shared pointer
in both mesos containerizer and the volume/image isolator.
Review: https://reviews.apache.org/r/51171/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/836ad5e0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/836ad5e0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/836ad5e0
Branch: refs/heads/master
Commit: 836ad5e00fc02cec39920ede1b08c94b2eddfb65
Parents: c28846f
Author: Gilbert Song <so...@gmail.com>
Authored: Mon Aug 22 13:00:34 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Aug 22 13:00:34 2016 -0700
----------------------------------------------------------------------
.../containerizer/mesos/provisioner/provisioner.cpp | 6 +++---
.../containerizer/mesos/provisioner/provisioner.hpp | 6 +++---
.../containerizer/mesos_containerizer_tests.cpp | 16 ++++++++--------
3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/836ad5e0/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 ad19fec..8e35ff4 100644
--- a/src/slave/containerizer/mesos/provisioner/provisioner.cpp
+++ b/src/slave/containerizer/mesos/provisioner/provisioner.cpp
@@ -118,7 +118,7 @@ Provisioner::~Provisioner()
Future<Nothing> Provisioner::recover(
const list<ContainerState>& states,
- const hashset<ContainerID>& orphans)
+ const hashset<ContainerID>& orphans) const
{
return dispatch(
CHECK_NOTNULL(process.get()),
@@ -130,7 +130,7 @@ Future<Nothing> Provisioner::recover(
Future<ProvisionInfo> Provisioner::provision(
const ContainerID& containerId,
- const Image& image)
+ const Image& image) const
{
return dispatch(
CHECK_NOTNULL(process.get()),
@@ -140,7 +140,7 @@ Future<ProvisionInfo> Provisioner::provision(
}
-Future<bool> Provisioner::destroy(const ContainerID& containerId)
+Future<bool> Provisioner::destroy(const ContainerID& containerId) const
{
return dispatch(
CHECK_NOTNULL(process.get()),
http://git-wip-us.apache.org/repos/asf/mesos/blob/836ad5e0/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 8f378f6..64cfa50 100644
--- a/src/slave/containerizer/mesos/provisioner/provisioner.hpp
+++ b/src/slave/containerizer/mesos/provisioner/provisioner.hpp
@@ -85,19 +85,19 @@ public:
// directories) to not leak anything.
virtual process::Future<Nothing> recover(
const std::list<mesos::slave::ContainerState>& states,
- const hashset<ContainerID>& orphans);
+ const hashset<ContainerID>& orphans) const;
// Provision a root filesystem for the container using the specified
// image and return the absolute path to the root filesystem.
virtual process::Future<ProvisionInfo> provision(
const ContainerID& containerId,
- const Image& image);
+ const Image& image) const;
// Destroy a previously provisioned root filesystem. Assumes that
// all references (e.g., mounts, open files) to the provisioned
// filesystem have been removed. Return false if there is no
// provisioned root filesystem for the given container.
- virtual process::Future<bool> destroy(const ContainerID& containerId);
+ virtual process::Future<bool> destroy(const ContainerID& containerId) const;
protected:
Provisioner() {} // For creating mock object.
http://git-wip-us.apache.org/repos/asf/mesos/blob/836ad5e0/src/tests/containerizer/mesos_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/mesos_containerizer_tests.cpp b/src/tests/containerizer/mesos_containerizer_tests.cpp
index 49f4552..2fd4ec5 100644
--- a/src/tests/containerizer/mesos_containerizer_tests.cpp
+++ b/src/tests/containerizer/mesos_containerizer_tests.cpp
@@ -761,16 +761,16 @@ class MockProvisioner : public mesos::internal::slave::Provisioner
{
public:
MockProvisioner() {}
- MOCK_METHOD2(recover,
- Future<Nothing>(const list<ContainerState>&,
- const hashset<ContainerID>&));
+ MOCK_CONST_METHOD2(recover,
+ Future<Nothing>(const list<ContainerState>&,
+ const hashset<ContainerID>&));
- MOCK_METHOD2(provision,
- Future<mesos::internal::slave::ProvisionInfo>(
- const ContainerID&,
- const Image&));
+ MOCK_CONST_METHOD2(provision,
+ Future<mesos::internal::slave::ProvisionInfo>(
+ const ContainerID&,
+ const Image&));
- MOCK_METHOD1(destroy, Future<bool>(const ContainerID&));
+ MOCK_CONST_METHOD1(destroy, Future<bool>(const ContainerID&));
};