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 2015/07/28 19:33:15 UTC
[2/2] mesos git commit: Renamed Executor{Limitation,
RunState} to Container{Limitation, State}.
Renamed Executor{Limitation,RunState} to Container{Limitation,State}.
Review: https://reviews.apache.org/r/36799
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c321283f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c321283f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c321283f
Branch: refs/heads/master
Commit: c321283fcc2f19db8d0c4cbfb30d8d9730f7760b
Parents: a3da1a1
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Tue Jul 28 10:22:55 2015 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Jul 28 10:23:17 2015 -0700
----------------------------------------------------------------------
include/mesos/slave/isolator.hpp | 4 ++--
include/mesos/slave/isolator.proto | 4 ++--
src/common/protobuf_utils.cpp | 12 ++++++------
src/common/protobuf_utils.hpp | 4 ++--
src/slave/containerizer/isolator.cpp | 8 ++++----
src/slave/containerizer/isolator.hpp | 8 ++++----
.../isolators/cgroups/cpushare.cpp | 10 +++++-----
.../isolators/cgroups/cpushare.hpp | 6 +++---
.../containerizer/isolators/cgroups/mem.cpp | 12 ++++++------
.../containerizer/isolators/cgroups/mem.hpp | 6 +++---
.../isolators/cgroups/perf_event.cpp | 12 ++++++------
.../isolators/cgroups/perf_event.hpp | 4 ++--
.../isolators/filesystem/posix.cpp | 12 ++++++------
.../isolators/filesystem/posix.hpp | 4 ++--
.../isolators/filesystem/shared.cpp | 10 +++++-----
.../isolators/filesystem/shared.hpp | 4 ++--
.../containerizer/isolators/namespaces/pid.cpp | 12 ++++++------
.../containerizer/isolators/namespaces/pid.hpp | 4 ++--
.../isolators/network/port_mapping.cpp | 12 ++++++------
.../isolators/network/port_mapping.hpp | 4 ++--
src/slave/containerizer/isolators/posix.hpp | 16 ++++++++--------
.../containerizer/isolators/posix/disk.cpp | 12 ++++++------
.../containerizer/isolators/posix/disk.hpp | 8 ++++----
src/slave/containerizer/launcher.cpp | 6 +++---
src/slave/containerizer/launcher.hpp | 4 ++--
src/slave/containerizer/linux_launcher.cpp | 6 +++---
src/slave/containerizer/linux_launcher.hpp | 2 +-
src/slave/containerizer/mesos/containerizer.cpp | 20 ++++++++++----------
src/slave/containerizer/mesos/containerizer.hpp | 16 ++++++++--------
src/slave/containerizer/provisioner.hpp | 4 ++--
src/tests/containerizer/containerizer_tests.cpp | 10 +++++-----
src/tests/containerizer/isolator.hpp | 6 +++---
src/tests/containerizer/launcher.hpp | 2 +-
33 files changed, 132 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/include/mesos/slave/isolator.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/slave/isolator.hpp b/include/mesos/slave/isolator.hpp
index e3befa3..22f1e36 100644
--- a/include/mesos/slave/isolator.hpp
+++ b/include/mesos/slave/isolator.hpp
@@ -61,7 +61,7 @@ public:
// (known to the launcher but not known to the slave) detected by
// the launcher.
virtual process::Future<Nothing> recover(
- const std::list<ExecutorRunState>& states,
+ const std::list<ContainerState>& states,
const hashset<ContainerID>& orphans) = 0;
// Prepare for isolation of the executor. Any steps that require
@@ -85,7 +85,7 @@ public:
// Watch the containerized executor and report if any resource
// constraint impacts the container, e.g., the kernel killing some
// processes.
- virtual process::Future<ExecutorLimitation> watch(
+ virtual process::Future<ContainerLimitation> watch(
const ContainerID& containerId) = 0;
// Update the resources allocated to the container.
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/include/mesos/slave/isolator.proto
----------------------------------------------------------------------
diff --git a/include/mesos/slave/isolator.proto b/include/mesos/slave/isolator.proto
index 289125f..c04a4e6 100644
--- a/include/mesos/slave/isolator.proto
+++ b/include/mesos/slave/isolator.proto
@@ -27,7 +27,7 @@ package mesos.slave;
* where the Linux kernel may invoke the OOM killer, killing some/all
* of a container's processes.
*/
-message ExecutorLimitation
+message ContainerLimitation
{
// Resources that triggered the limitation.
// NOTE: 'Resources' is used here because the resource may span
@@ -45,7 +45,7 @@ message ExecutorLimitation
* containers. The reason for not using RunState instead is to avoid
* any dependency on RunState and in turn on internal protobufs.
*/
-message ExecutorRunState
+message ContainerState
{
required ExecutorInfo executor_info = 1;
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/common/protobuf_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.cpp b/src/common/protobuf_utils.cpp
index bf178d2..3cb6845 100644
--- a/src/common/protobuf_utils.cpp
+++ b/src/common/protobuf_utils.cpp
@@ -37,8 +37,8 @@ using std::string;
using mesos::scheduler::Event;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerLimitation;
+using mesos::slave::ContainerState;
using process::UPID;
@@ -223,11 +223,11 @@ Label createLabel(const std::string& key, const std::string& value)
namespace slave {
-ExecutorLimitation createExecutorLimitation(
+ContainerLimitation createContainerLimitation(
const Resources& resources,
const std::string& message)
{
- ExecutorLimitation limitation;
+ ContainerLimitation limitation;
foreach (Resource resource, resources) {
limitation.add_resources()->CopyFrom(resource);
}
@@ -236,14 +236,14 @@ ExecutorLimitation createExecutorLimitation(
}
-ExecutorRunState createExecutorRunState(
+ContainerState createContainerState(
const ExecutorInfo& executorInfo,
const ContainerID& container_id,
pid_t pid,
const std::string& directory,
const Option<std::string>& rootfs)
{
- ExecutorRunState state;
+ ContainerState state;
state.mutable_executor_info()->CopyFrom(executorInfo);
state.mutable_container_id()->CopyFrom(container_id);
state.set_pid(pid);
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/common/protobuf_utils.hpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.hpp b/src/common/protobuf_utils.hpp
index 5c99254..a4708ed 100644
--- a/src/common/protobuf_utils.hpp
+++ b/src/common/protobuf_utils.hpp
@@ -79,12 +79,12 @@ Label createLabel(const std::string& key, const std::string& value);
namespace slave {
-mesos::slave::ExecutorLimitation createExecutorLimitation(
+mesos::slave::ContainerLimitation createContainerLimitation(
const Resources& resources,
const std::string& message);
-mesos::slave::ExecutorRunState createExecutorRunState(
+mesos::slave::ContainerState createContainerState(
const ExecutorInfo& executorInfo,
const ContainerID& id,
pid_t pid,
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolator.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolator.cpp b/src/slave/containerizer/isolator.cpp
index 3c1fc53..ed610f9 100644
--- a/src/slave/containerizer/isolator.cpp
+++ b/src/slave/containerizer/isolator.cpp
@@ -25,9 +25,9 @@ using namespace process;
using std::string;
using std::list;
+using mesos::slave::ContainerLimitation;
using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
namespace mesos {
namespace internal {
@@ -54,7 +54,7 @@ Future<Option<int>> MesosIsolator::namespaces()
Future<Nothing> MesosIsolator::recover(
- const list<ExecutorRunState>& state,
+ const list<ContainerState>& state,
const hashset<ContainerID>& orphans)
{
return dispatch(process.get(),
@@ -92,7 +92,7 @@ Future<Nothing> MesosIsolator::isolate(
}
-Future<ExecutorLimitation> MesosIsolator::watch(
+Future<ContainerLimitation> MesosIsolator::watch(
const ContainerID& containerId)
{
return dispatch(process.get(),
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolator.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolator.hpp b/src/slave/containerizer/isolator.hpp
index 2d895fc..710c584 100644
--- a/src/slave/containerizer/isolator.hpp
+++ b/src/slave/containerizer/isolator.hpp
@@ -46,7 +46,7 @@ public:
virtual process::Future<Option<int>> namespaces();
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& states,
+ const std::list<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
@@ -60,7 +60,7 @@ public:
const ContainerID& containerId,
pid_t pid);
- virtual process::Future<mesos::slave::ExecutorLimitation> watch(
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId);
virtual process::Future<Nothing> update(
@@ -86,7 +86,7 @@ public:
virtual process::Future<Option<int>> namespaces() { return None(); }
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& states,
+ const std::list<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans) = 0;
virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
@@ -100,7 +100,7 @@ public:
const ContainerID& containerId,
pid_t pid) = 0;
- virtual process::Future<mesos::slave::ExecutorLimitation> watch(
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId) = 0;
virtual process::Future<Nothing> update(
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/cgroups/cpushare.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.cpp b/src/slave/containerizer/isolators/cgroups/cpushare.cpp
index b29ccf8..907d7e7 100644
--- a/src/slave/containerizer/isolators/cgroups/cpushare.cpp
+++ b/src/slave/containerizer/isolators/cgroups/cpushare.cpp
@@ -47,9 +47,9 @@ using std::set;
using std::string;
using std::vector;
+using mesos::slave::ContainerLimitation;
using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
using mesos::slave::Isolator;
namespace mesos {
@@ -165,10 +165,10 @@ Try<Isolator*> CgroupsCpushareIsolatorProcess::create(const Flags& flags)
Future<Nothing> CgroupsCpushareIsolatorProcess::recover(
- const list<ExecutorRunState>& states,
+ const list<ContainerState>& states,
const hashset<ContainerID>& orphans)
{
- foreach (const ExecutorRunState& state, states) {
+ foreach (const ContainerState& state, states) {
const ContainerID& containerId = state.container_id();
const string cgroup = path::join(flags.cgroups_root, containerId.value());
@@ -332,7 +332,7 @@ Future<Nothing> CgroupsCpushareIsolatorProcess::isolate(
}
-Future<ExecutorLimitation> CgroupsCpushareIsolatorProcess::watch(
+Future<ContainerLimitation> CgroupsCpushareIsolatorProcess::watch(
const ContainerID& containerId)
{
if (!infos.contains(containerId)) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/cgroups/cpushare.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.hpp b/src/slave/containerizer/isolators/cgroups/cpushare.hpp
index 917d6d3..6b980f2 100644
--- a/src/slave/containerizer/isolators/cgroups/cpushare.hpp
+++ b/src/slave/containerizer/isolators/cgroups/cpushare.hpp
@@ -51,7 +51,7 @@ public:
virtual ~CgroupsCpushareIsolatorProcess();
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& states,
+ const std::list<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
@@ -65,7 +65,7 @@ public:
const ContainerID& containerId,
pid_t pid);
- virtual process::Future<mesos::slave::ExecutorLimitation> watch(
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId);
virtual process::Future<Nothing> update(
@@ -98,7 +98,7 @@ private:
Option<pid_t> pid;
Option<Resources> resources;
- process::Promise<mesos::slave::ExecutorLimitation> limitation;
+ process::Promise<mesos::slave::ContainerLimitation> limitation;
};
const Flags flags;
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/cgroups/mem.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/mem.cpp b/src/slave/containerizer/isolators/cgroups/mem.cpp
index d330fc3..e343d0b 100644
--- a/src/slave/containerizer/isolators/cgroups/mem.cpp
+++ b/src/slave/containerizer/isolators/cgroups/mem.cpp
@@ -54,9 +54,9 @@ using std::set;
using std::string;
using std::vector;
+using mesos::slave::ContainerLimitation;
using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
using mesos::slave::Isolator;
namespace mesos {
@@ -157,10 +157,10 @@ Try<Isolator*> CgroupsMemIsolatorProcess::create(const Flags& flags)
Future<Nothing> CgroupsMemIsolatorProcess::recover(
- const list<ExecutorRunState>& states,
+ const list<ContainerState>& states,
const hashset<ContainerID>& orphans)
{
- foreach (const ExecutorRunState& state, states) {
+ foreach (const ContainerState& state, states) {
const ContainerID& containerId = state.container_id();
const string cgroup = path::join(flags.cgroups_root, containerId.value());
@@ -313,7 +313,7 @@ Future<Nothing> CgroupsMemIsolatorProcess::isolate(
}
-Future<ExecutorLimitation> CgroupsMemIsolatorProcess::watch(
+Future<ContainerLimitation> CgroupsMemIsolatorProcess::watch(
const ContainerID& containerId)
{
if (!infos.contains(containerId)) {
@@ -690,7 +690,7 @@ void CgroupsMemIsolatorProcess::oom(const ContainerID& containerId)
stringify(usage.isSome() ? usage.get().megabytes() : 0),
"*").get();
- info->limitation.set(protobuf::slave::createExecutorLimitation(
+ info->limitation.set(protobuf::slave::createContainerLimitation(
mem, message.str()));
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/cgroups/mem.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/mem.hpp b/src/slave/containerizer/isolators/cgroups/mem.hpp
index 178d566..e831878 100644
--- a/src/slave/containerizer/isolators/cgroups/mem.hpp
+++ b/src/slave/containerizer/isolators/cgroups/mem.hpp
@@ -46,7 +46,7 @@ public:
virtual ~CgroupsMemIsolatorProcess();
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& states,
+ const std::list<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
@@ -60,7 +60,7 @@ public:
const ContainerID& containerId,
pid_t pid);
- virtual process::Future<mesos::slave::ExecutorLimitation> watch(
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId);
virtual process::Future<Nothing> update(
@@ -98,7 +98,7 @@ private:
const std::string cgroup;
Option<pid_t> pid;
- process::Promise<mesos::slave::ExecutorLimitation> limitation;
+ process::Promise<mesos::slave::ContainerLimitation> limitation;
// Used to cancel the OOM listening.
process::Future<Nothing> oomNotifier;
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/cgroups/perf_event.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/perf_event.cpp b/src/slave/containerizer/isolators/cgroups/perf_event.cpp
index c78eea9..0e421cb 100644
--- a/src/slave/containerizer/isolators/cgroups/perf_event.cpp
+++ b/src/slave/containerizer/isolators/cgroups/perf_event.cpp
@@ -53,9 +53,9 @@ using std::set;
using std::string;
using std::vector;
+using mesos::slave::ContainerLimitation;
using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
using mesos::slave::Isolator;
namespace mesos {
@@ -139,10 +139,10 @@ void CgroupsPerfEventIsolatorProcess::initialize()
Future<Nothing> CgroupsPerfEventIsolatorProcess::recover(
- const list<ExecutorRunState>& states,
+ const list<ContainerState>& states,
const hashset<ContainerID>& orphans)
{
- foreach (const ExecutorRunState& state, states) {
+ foreach (const ContainerState& state, states) {
const ContainerID& containerId = state.container_id();
const string cgroup = path::join(flags.cgroups_root, containerId.value());
@@ -293,11 +293,11 @@ Future<Nothing> CgroupsPerfEventIsolatorProcess::isolate(
}
-Future<ExecutorLimitation> CgroupsPerfEventIsolatorProcess::watch(
+Future<ContainerLimitation> CgroupsPerfEventIsolatorProcess::watch(
const ContainerID& containerId)
{
// No resources are limited.
- return Future<ExecutorLimitation>();
+ return Future<ContainerLimitation>();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/cgroups/perf_event.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/perf_event.hpp b/src/slave/containerizer/isolators/cgroups/perf_event.hpp
index 47b2e9e..73f245b 100644
--- a/src/slave/containerizer/isolators/cgroups/perf_event.hpp
+++ b/src/slave/containerizer/isolators/cgroups/perf_event.hpp
@@ -42,7 +42,7 @@ public:
virtual ~CgroupsPerfEventIsolatorProcess();
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& states,
+ const std::list<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
@@ -56,7 +56,7 @@ public:
const ContainerID& containerId,
pid_t pid);
- virtual process::Future<mesos::slave::ExecutorLimitation> watch(
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId);
virtual process::Future<Nothing> update(
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/filesystem/posix.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/filesystem/posix.cpp b/src/slave/containerizer/isolators/filesystem/posix.cpp
index 44a7ec6..4861ee1 100644
--- a/src/slave/containerizer/isolators/filesystem/posix.cpp
+++ b/src/slave/containerizer/isolators/filesystem/posix.cpp
@@ -32,9 +32,9 @@ using namespace process;
using std::list;
using std::string;
+using mesos::slave::ContainerLimitation;
using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
using mesos::slave::Isolator;
namespace mesos {
@@ -59,10 +59,10 @@ Try<Isolator*> PosixFilesystemIsolatorProcess::create(const Flags& flags)
Future<Nothing> PosixFilesystemIsolatorProcess::recover(
- const list<ExecutorRunState>& states,
+ const list<ContainerState>& states,
const hashset<ContainerID>& orphans)
{
- foreach (const ExecutorRunState& state, states) {
+ foreach (const ContainerState& state, states) {
infos.put(state.container_id(), Owned<Info>(new Info(state.directory())));
}
@@ -103,11 +103,11 @@ Future<Nothing> PosixFilesystemIsolatorProcess::isolate(
}
-Future<ExecutorLimitation> PosixFilesystemIsolatorProcess::watch(
+Future<ContainerLimitation> PosixFilesystemIsolatorProcess::watch(
const ContainerID& containerId)
{
// No-op.
- return Future<ExecutorLimitation>();
+ return Future<ContainerLimitation>();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/filesystem/posix.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/filesystem/posix.hpp b/src/slave/containerizer/isolators/filesystem/posix.hpp
index 927f336..4c7a6f2 100644
--- a/src/slave/containerizer/isolators/filesystem/posix.hpp
+++ b/src/slave/containerizer/isolators/filesystem/posix.hpp
@@ -37,7 +37,7 @@ public:
virtual ~PosixFilesystemIsolatorProcess();
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& states,
+ const std::list<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
@@ -51,7 +51,7 @@ public:
const ContainerID& containerId,
pid_t pid);
- virtual process::Future<mesos::slave::ExecutorLimitation> watch(
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId);
virtual process::Future<Nothing> update(
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/filesystem/shared.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/filesystem/shared.cpp b/src/slave/containerizer/isolators/filesystem/shared.cpp
index 754a6fd..0047945 100644
--- a/src/slave/containerizer/isolators/filesystem/shared.cpp
+++ b/src/slave/containerizer/isolators/filesystem/shared.cpp
@@ -28,9 +28,9 @@ using std::list;
using std::set;
using std::string;
+using mesos::slave::ContainerLimitation;
using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
using mesos::slave::Isolator;
namespace mesos {
@@ -71,7 +71,7 @@ process::Future<Option<int>> SharedFilesystemIsolatorProcess::namespaces()
Future<Nothing> SharedFilesystemIsolatorProcess::recover(
- const list<ExecutorRunState>& states,
+ const list<ContainerState>& states,
const hashset<ContainerID>& orphans)
{
// There is nothing to recover because we do not keep any state and
@@ -236,12 +236,12 @@ Future<Nothing> SharedFilesystemIsolatorProcess::isolate(
}
-Future<ExecutorLimitation> SharedFilesystemIsolatorProcess::watch(
+Future<ContainerLimitation> SharedFilesystemIsolatorProcess::watch(
const ContainerID& containerId)
{
// No-op, for now.
- return Future<ExecutorLimitation>();
+ return Future<ContainerLimitation>();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/filesystem/shared.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/filesystem/shared.hpp b/src/slave/containerizer/isolators/filesystem/shared.hpp
index 8fba9fe..45e4ba0 100644
--- a/src/slave/containerizer/isolators/filesystem/shared.hpp
+++ b/src/slave/containerizer/isolators/filesystem/shared.hpp
@@ -42,7 +42,7 @@ public:
virtual process::Future<Option<int>> namespaces();
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& states,
+ const std::list<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
@@ -56,7 +56,7 @@ public:
const ContainerID& containerId,
pid_t pid);
- virtual process::Future<mesos::slave::ExecutorLimitation> watch(
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId);
virtual process::Future<Nothing> update(
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/namespaces/pid.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/namespaces/pid.cpp b/src/slave/containerizer/isolators/namespaces/pid.cpp
index 8f4c13e..14871a9 100644
--- a/src/slave/containerizer/isolators/namespaces/pid.cpp
+++ b/src/slave/containerizer/isolators/namespaces/pid.cpp
@@ -39,9 +39,9 @@ using std::list;
using std::set;
using std::string;
+using mesos::slave::ContainerLimitation;
using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
using mesos::slave::Isolator;
namespace mesos {
@@ -128,11 +128,11 @@ process::Future<Option<int>> NamespacesPidIsolatorProcess::namespaces()
Future<Nothing> NamespacesPidIsolatorProcess::recover(
- const list<ExecutorRunState>& states,
+ const list<ContainerState>& states,
const hashset<ContainerID>& orphans)
{
hashset<ContainerID> recovered;
- foreach (const ExecutorRunState& state, states) {
+ foreach (const ContainerState& state, states) {
recovered.insert(state.container_id());
}
@@ -220,10 +220,10 @@ Future<Nothing> NamespacesPidIsolatorProcess::isolate(
}
-Future<ExecutorLimitation> NamespacesPidIsolatorProcess::watch(
+Future<ContainerLimitation> NamespacesPidIsolatorProcess::watch(
const ContainerID& containerId)
{
- return Future<ExecutorLimitation>();
+ return Future<ContainerLimitation>();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/namespaces/pid.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/namespaces/pid.hpp b/src/slave/containerizer/isolators/namespaces/pid.hpp
index f718fa3..858e436 100644
--- a/src/slave/containerizer/isolators/namespaces/pid.hpp
+++ b/src/slave/containerizer/isolators/namespaces/pid.hpp
@@ -59,7 +59,7 @@ public:
virtual process::Future<Option<int>> namespaces();
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& states,
+ const std::list<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
@@ -73,7 +73,7 @@ public:
const ContainerID& containerId,
pid_t pid);
- virtual process::Future<mesos::slave::ExecutorLimitation> watch(
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId);
virtual process::Future<Nothing> update(
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/network/port_mapping.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/network/port_mapping.cpp b/src/slave/containerizer/isolators/network/port_mapping.cpp
index d7c0ef0..77e649c 100644
--- a/src/slave/containerizer/isolators/network/port_mapping.cpp
+++ b/src/slave/containerizer/isolators/network/port_mapping.cpp
@@ -106,9 +106,9 @@ using std::vector;
using filter::ip::PortRange;
+using mesos::slave::ContainerLimitation;
using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
using mesos::slave::Isolator;
// An old glibc might not have this symbol.
@@ -1633,7 +1633,7 @@ process::Future<Option<int>> PortMappingIsolatorProcess::namespaces()
Future<Nothing> PortMappingIsolatorProcess::recover(
- const list<ExecutorRunState>& states,
+ const list<ContainerState>& states,
const hashset<ContainerID>& orphans)
{
// Extract pids from virtual device names (veth). This tells us
@@ -1802,7 +1802,7 @@ Future<Nothing> PortMappingIsolatorProcess::recover(
}
// Now, actually recover the isolator from slave's state.
- foreach (const ExecutorRunState& state, states) {
+ foreach (const ContainerState& state, states) {
const ContainerID& containerId = state.container_id();
pid_t pid = state.pid();
@@ -2493,7 +2493,7 @@ Future<Nothing> PortMappingIsolatorProcess::isolate(
}
-Future<ExecutorLimitation> PortMappingIsolatorProcess::watch(
+Future<ContainerLimitation> PortMappingIsolatorProcess::watch(
const ContainerID& containerId)
{
if (unmanaged.contains(containerId)) {
@@ -2504,7 +2504,7 @@ Future<ExecutorLimitation> PortMappingIsolatorProcess::watch(
// Currently, we always return a pending future because limitation
// is never reached.
- return Future<ExecutorLimitation>();
+ return Future<ContainerLimitation>();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/network/port_mapping.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/network/port_mapping.hpp b/src/slave/containerizer/isolators/network/port_mapping.hpp
index b73943a..2599c98 100644
--- a/src/slave/containerizer/isolators/network/port_mapping.hpp
+++ b/src/slave/containerizer/isolators/network/port_mapping.hpp
@@ -155,7 +155,7 @@ public:
virtual process::Future<Option<int>> namespaces();
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& states,
+ const std::list<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
@@ -169,7 +169,7 @@ public:
const ContainerID& containerId,
pid_t pid);
- virtual process::Future<mesos::slave::ExecutorLimitation> watch(
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId);
virtual process::Future<Nothing> update(
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/posix.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/posix.hpp b/src/slave/containerizer/isolators/posix.hpp
index 67f2fb1..ef19749 100644
--- a/src/slave/containerizer/isolators/posix.hpp
+++ b/src/slave/containerizer/isolators/posix.hpp
@@ -42,10 +42,10 @@ class PosixIsolatorProcess : public MesosIsolatorProcess
{
public:
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& state,
+ const std::list<mesos::slave::ContainerState>& state,
const hashset<ContainerID>& orphans)
{
- foreach (const mesos::slave::ExecutorRunState& run, state) {
+ foreach (const mesos::slave::ContainerState& run, state) {
// This should (almost) never occur: see comment in
// PosixLauncher::recover().
if (pids.contains(run.container_id())) {
@@ -54,8 +54,8 @@ public:
pids.put(run.container_id(), run.pid());
- process::Owned<process::Promise<mesos::slave::ExecutorLimitation>>
- promise(new process::Promise<mesos::slave::ExecutorLimitation>());
+ process::Owned<process::Promise<mesos::slave::ContainerLimitation>>
+ promise(new process::Promise<mesos::slave::ContainerLimitation>());
promises.put(run.container_id(), promise);
}
@@ -74,8 +74,8 @@ public:
" has already been prepared");
}
- process::Owned<process::Promise<mesos::slave::ExecutorLimitation>> promise(
- new process::Promise<mesos::slave::ExecutorLimitation>());
+ process::Owned<process::Promise<mesos::slave::ContainerLimitation>> promise(
+ new process::Promise<mesos::slave::ContainerLimitation>());
promises.put(containerId, promise);
return None();
@@ -94,7 +94,7 @@ public:
return Nothing();
}
- virtual process::Future<mesos::slave::ExecutorLimitation> watch(
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId)
{
if (!promises.contains(containerId)) {
@@ -134,7 +134,7 @@ public:
protected:
hashmap<ContainerID, pid_t> pids;
hashmap<ContainerID,
- process::Owned<process::Promise<mesos::slave::ExecutorLimitation>>>
+ process::Owned<process::Promise<mesos::slave::ContainerLimitation>>>
promises;
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/posix/disk.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/posix/disk.cpp b/src/slave/containerizer/isolators/posix/disk.cpp
index 7ef843a..6dda77b 100644
--- a/src/slave/containerizer/isolators/posix/disk.cpp
+++ b/src/slave/containerizer/isolators/posix/disk.cpp
@@ -55,9 +55,9 @@ using std::list;
using std::string;
using std::vector;
+using mesos::slave::ContainerLimitation;
using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
using mesos::slave::Isolator;
namespace mesos {
@@ -87,10 +87,10 @@ PosixDiskIsolatorProcess::~PosixDiskIsolatorProcess() {}
Future<Nothing> PosixDiskIsolatorProcess::recover(
- const list<ExecutorRunState>& states,
+ const list<ContainerState>& states,
const hashset<ContainerID>& orphans)
{
- foreach (const ExecutorRunState& state, states) {
+ foreach (const ContainerState& state, states) {
// Since we checkpoint the executor after we create its working
// directory, the working directory should definitely exist.
CHECK(os::exists(state.directory()))
@@ -132,7 +132,7 @@ Future<Nothing> PosixDiskIsolatorProcess::isolate(
}
-Future<ExecutorLimitation> PosixDiskIsolatorProcess::watch(
+Future<ContainerLimitation> PosixDiskIsolatorProcess::watch(
const ContainerID& containerId)
{
if (!infos.contains(containerId)) {
@@ -248,7 +248,7 @@ void PosixDiskIsolatorProcess::_collect(
CHECK_SOME(quota);
if (future.get() > quota.get()) {
- info->limitation.set(protobuf::slave::createExecutorLimitation(
+ info->limitation.set(protobuf::slave::createContainerLimitation(
Resources(info->paths[path].quota),
"Disk usage (" + stringify(future.get()) +
") exceeds quota (" + stringify(quota.get()) + ")"));
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/isolators/posix/disk.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/posix/disk.hpp b/src/slave/containerizer/isolators/posix/disk.hpp
index fc6cc40..9fa584f 100644
--- a/src/slave/containerizer/isolators/posix/disk.hpp
+++ b/src/slave/containerizer/isolators/posix/disk.hpp
@@ -58,7 +58,7 @@ private:
// This isolator monitors the disk usage for containers, and reports
-// ExecutorLimitation when a container exceeds its disk quota. This
+// ContainerLimitation when a container exceeds its disk quota. This
// leverages the DiskUsageCollector to ensure that we don't induce too
// much CPU usage and disk caching effects from running 'du' too
// often.
@@ -79,7 +79,7 @@ public:
virtual ~PosixDiskIsolatorProcess();
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& states,
+ const std::list<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans);
virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
@@ -93,7 +93,7 @@ public:
const ContainerID& containerId,
pid_t pid);
- virtual process::Future<mesos::slave::ExecutorLimitation> watch(
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
const ContainerID& containerId);
virtual process::Future<Nothing> update(
@@ -125,7 +125,7 @@ private:
// to collect disk usage for disk resources without DiskInfo.
const std::string directory;
- process::Promise<mesos::slave::ExecutorLimitation> limitation;
+ process::Promise<mesos::slave::ContainerLimitation> limitation;
// The keys of the hashmaps contain the executor working directory
// above, and optionally paths of volumes used by the container.
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/launcher.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/launcher.cpp b/src/slave/containerizer/launcher.cpp
index ecb3330..5267eec 100644
--- a/src/slave/containerizer/launcher.cpp
+++ b/src/slave/containerizer/launcher.cpp
@@ -36,7 +36,7 @@ using std::map;
using std::string;
using std::vector;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
namespace mesos {
namespace internal {
@@ -50,9 +50,9 @@ Try<Launcher*> PosixLauncher::create(const Flags& flags)
Future<hashset<ContainerID>> PosixLauncher::recover(
- const list<ExecutorRunState>& states)
+ const list<ContainerState>& states)
{
- foreach (const ExecutorRunState& state, states) {
+ foreach (const ContainerState& state, states) {
const ContainerID& containerId = state.container_id();
pid_t pid = state.pid();
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/launcher.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/launcher.hpp b/src/slave/containerizer/launcher.hpp
index a19b859..8cc832e 100644
--- a/src/slave/containerizer/launcher.hpp
+++ b/src/slave/containerizer/launcher.hpp
@@ -54,7 +54,7 @@ public:
// Return the set of containers that are known to the launcher but
// not known to the slave (a.k.a. orphans).
virtual process::Future<hashset<ContainerID>> recover(
- const std::list<mesos::slave::ExecutorRunState>& states) = 0;
+ const std::list<mesos::slave::ContainerState>& states) = 0;
// Fork a new process in the containerized context. The child will
// exec the binary at the given path with the given argv, flags and
@@ -91,7 +91,7 @@ public:
virtual ~PosixLauncher() {}
virtual process::Future<hashset<ContainerID>> recover(
- const std::list<mesos::slave::ExecutorRunState>& states);
+ const std::list<mesos::slave::ContainerState>& states);
virtual Try<pid_t> fork(
const ContainerID& containerId,
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/linux_launcher.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/linux_launcher.cpp b/src/slave/containerizer/linux_launcher.cpp
index ed2e881..12acf4d 100644
--- a/src/slave/containerizer/linux_launcher.cpp
+++ b/src/slave/containerizer/linux_launcher.cpp
@@ -49,7 +49,7 @@ using std::set;
using std::string;
using std::vector;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
namespace mesos {
namespace internal {
@@ -110,11 +110,11 @@ Try<Launcher*> LinuxLauncher::create(
Future<hashset<ContainerID>> LinuxLauncher::recover(
- const std::list<ExecutorRunState>& states)
+ const std::list<ContainerState>& states)
{
hashset<string> recovered;
- foreach (const ExecutorRunState& state, states) {
+ foreach (const ContainerState& state, states) {
const ContainerID& containerId = state.container_id();
pid_t pid = state.pid();
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/linux_launcher.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/linux_launcher.hpp b/src/slave/containerizer/linux_launcher.hpp
index 28a7d35..bf6bf3f 100644
--- a/src/slave/containerizer/linux_launcher.hpp
+++ b/src/slave/containerizer/linux_launcher.hpp
@@ -37,7 +37,7 @@ public:
virtual ~LinuxLauncher() {}
virtual process::Future<hashset<ContainerID>> recover(
- const std::list<mesos::slave::ExecutorRunState>& states);
+ const std::list<mesos::slave::ContainerState>& states);
virtual Try<pid_t> fork(
const ContainerID& containerId,
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index c0159a0..b8045d7 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -84,9 +84,9 @@ namespace slave {
using mesos::modules::ModuleManager;
+using mesos::slave::ContainerLimitation;
using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
using mesos::slave::Isolator;
using state::SlaveState;
@@ -349,7 +349,7 @@ Future<Nothing> MesosContainerizerProcess::recover(
LOG(INFO) << "Recovering containerizer";
// Gather the executor run states that we will attempt to recover.
- list<ExecutorRunState> recoverable;
+ list<ContainerState> recoverable;
if (state.isSome()) {
foreachvalue (const FrameworkState& framework, state.get().frameworks) {
foreachvalue (const ExecutorState& executor, framework.executors) {
@@ -417,8 +417,8 @@ Future<Nothing> MesosContainerizerProcess::recover(
CHECK(os::exists(directory));
- ExecutorRunState executorRunState =
- protobuf::slave::createExecutorRunState(
+ ContainerState executorRunState =
+ protobuf::slave::createContainerState(
executorInfo,
run.get().id.get(),
run.get().forkedPid.get(),
@@ -437,7 +437,7 @@ Future<Nothing> MesosContainerizerProcess::recover(
Future<Nothing> MesosContainerizerProcess::_recover(
- const list<ExecutorRunState>& recoverable,
+ const list<ContainerState>& recoverable,
const hashset<ContainerID>& orphans)
{
list<Future<Nothing>> futures;
@@ -459,10 +459,10 @@ Future<Nothing> MesosContainerizerProcess::_recover(
Future<Nothing> MesosContainerizerProcess::__recover(
- const list<ExecutorRunState>& recovered,
+ const list<ContainerState>& recovered,
const hashset<ContainerID>& orphans)
{
- foreach (const ExecutorRunState& run, recovered) {
+ foreach (const ContainerState& run, recovered) {
const ContainerID& containerId = run.container_id();
Container* container = new Container();
@@ -1335,7 +1335,7 @@ void MesosContainerizerProcess::_____destroy(
// exit.
if (!killed && container->limitations.size() > 0) {
string message_;
- foreach (const ExecutorLimitation& limitation, container->limitations) {
+ foreach (const ContainerLimitation& limitation, container->limitations) {
message_ += limitation.message();
}
message = strings::trim(message_);
@@ -1379,7 +1379,7 @@ void MesosContainerizerProcess::reaped(const ContainerID& containerId)
void MesosContainerizerProcess::limited(
const ContainerID& containerId,
- const Future<ExecutorLimitation>& future)
+ const Future<ContainerLimitation>& future)
{
if (!containers_.contains(containerId) ||
containers_[containerId]->state == DESTROYING) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/mesos/containerizer.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.hpp b/src/slave/containerizer/mesos/containerizer.hpp
index 601ea51..8851d30 100644
--- a/src/slave/containerizer/mesos/containerizer.hpp
+++ b/src/slave/containerizer/mesos/containerizer.hpp
@@ -176,11 +176,11 @@ public:
private:
process::Future<Nothing> _recover(
- const std::list<mesos::slave::ExecutorRunState>& recoverable,
+ const std::list<mesos::slave::ContainerState>& recoverable,
const hashset<ContainerID>& orphans);
process::Future<Nothing> __recover(
- const std::list<mesos::slave::ExecutorRunState>& recovered,
+ const std::list<mesos::slave::ContainerState>& recovered,
const hashset<ContainerID>& orphans);
process::Future<Nothing> provision(
@@ -198,10 +198,10 @@ private:
const std::string& rootfs);
process::Future<std::list<Option<mesos::slave::ContainerPrepareInfo>>>
- prepare(const ContainerID& containerId,
- const ExecutorInfo& executorInfo,
- const std::string& directory,
- const Option<std::string>& user);
+ prepare(const ContainerID& containerId,
+ const ExecutorInfo& executorInfo,
+ const std::string& directory,
+ const Option<std::string>& user);
process::Future<Nothing> fetch(
const ContainerID& containerId,
@@ -262,7 +262,7 @@ private:
// processes. This will trigger container destruction.
void limited(
const ContainerID& containerId,
- const process::Future<mesos::slave::ExecutorLimitation>& future);
+ const process::Future<mesos::slave::ContainerLimitation>& future);
// Call back for when the executor exits. This will trigger container
// destroy.
@@ -312,7 +312,7 @@ private:
// We keep track of any limitations received from each isolator so we can
// determine the cause of an executor termination.
- std::vector<mesos::slave::ExecutorLimitation> limitations;
+ std::vector<mesos::slave::ContainerLimitation> limitations;
// We keep track of the resources for each container so we can set the
// ResourceStatistics limits in usage().
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/slave/containerizer/provisioner.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/provisioner.hpp b/src/slave/containerizer/provisioner.hpp
index f7fb068..cb4d511 100644
--- a/src/slave/containerizer/provisioner.hpp
+++ b/src/slave/containerizer/provisioner.hpp
@@ -23,7 +23,7 @@
#include <mesos/resources.hpp>
-#include <mesos/slave/isolator.hpp> // For ExecutorRunState.
+#include <mesos/slave/isolator.hpp> // For ContainerState.
#include <stout/hashmap.hpp>
#include <stout/nothing.hpp>
@@ -54,7 +54,7 @@ public:
// responsible for cleaning up any intermediate artifacts (e.g.
// directories) to not leak anything.
virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ExecutorRunState>& states,
+ const std::list<mesos::slave::ContainerState>& states,
const hashset<ContainerID>& orphans) = 0;
// Provision a root filesystem for the container using the specified
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/tests/containerizer/containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/containerizer_tests.cpp b/src/tests/containerizer/containerizer_tests.cpp
index 82baca7..18c478a 100644
--- a/src/tests/containerizer/containerizer_tests.cpp
+++ b/src/tests/containerizer/containerizer_tests.cpp
@@ -63,9 +63,9 @@ using mesos::internal::slave::state::FrameworkState;
using mesos::internal::slave::state::RunState;
using mesos::internal::slave::state::SlaveState;
+using mesos::slave::ContainerLimitation;
using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ExecutorLimitation;
-using mesos::slave::ExecutorRunState;
+using mesos::slave::ContainerState;
using mesos::slave::Isolator;
using std::list;
@@ -485,7 +485,7 @@ public:
MOCK_METHOD2(
recover,
Future<Nothing>(
- const list<ExecutorRunState>&,
+ const list<ContainerState>&,
const hashset<ContainerID>&));
MOCK_METHOD5(
@@ -513,7 +513,7 @@ public:
MOCK_METHOD1(
watch,
- Future<mesos::slave::ExecutorLimitation>(const ContainerID&));
+ Future<mesos::slave::ContainerLimitation>(const ContainerID&));
MOCK_METHOD2(
update,
@@ -527,7 +527,7 @@ public:
cleanup,
Future<Nothing>(const ContainerID&));
- Promise<mesos::slave::ExecutorLimitation> watchPromise;
+ Promise<mesos::slave::ContainerLimitation> watchPromise;
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/tests/containerizer/isolator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/isolator.hpp b/src/tests/containerizer/isolator.hpp
index 5eac750..fa2fc9b 100644
--- a/src/tests/containerizer/isolator.hpp
+++ b/src/tests/containerizer/isolator.hpp
@@ -42,7 +42,7 @@ public:
MOCK_METHOD2(
recover,
process::Future<Nothing>(
- const std::list<mesos::slave::ExecutorRunState>&,
+ const std::list<mesos::slave::ContainerState>&,
const hashset<ContainerID>&));
virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
@@ -61,7 +61,7 @@ public:
MOCK_METHOD1(
watch,
- process::Future<mesos::slave::ExecutorLimitation>(const ContainerID&));
+ process::Future<mesos::slave::ContainerLimitation>(const ContainerID&));
MOCK_METHOD2(
update,
@@ -91,7 +91,7 @@ private:
const Option<mesos::slave::ContainerPrepareInfo> prepareInfo;
- process::Promise<mesos::slave::ExecutorLimitation> promise;
+ process::Promise<mesos::slave::ContainerLimitation> promise;
};
} // namespace tests {
http://git-wip-us.apache.org/repos/asf/mesos/blob/c321283f/src/tests/containerizer/launcher.hpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/launcher.hpp b/src/tests/containerizer/launcher.hpp
index 78216e0..b80e841 100644
--- a/src/tests/containerizer/launcher.hpp
+++ b/src/tests/containerizer/launcher.hpp
@@ -92,7 +92,7 @@ public:
MOCK_METHOD1(
recover,
process::Future<hashset<ContainerID>>(
- const std::list<mesos::slave::ExecutorRunState>& states));
+ const std::list<mesos::slave::ContainerState>& states));
MOCK_METHOD9(
fork,