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/12/03 00:42:38 UTC
mesos git commit: Relocated containerizer isolator files under mesos
containerizer.
Repository: mesos
Updated Branches:
refs/heads/master 534b29fd2 -> 80c45177d
Relocated containerizer isolator files under mesos containerizer.
Review: https://reviews.apache.org/r/40372
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/80c45177
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/80c45177
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/80c45177
Branch: refs/heads/master
Commit: 80c45177dc3daa977831f58326ae6b5d051604c5
Parents: 534b29f
Author: Gilbert Song <so...@gmail.com>
Authored: Wed Dec 2 15:37:19 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Dec 2 15:38:10 2015 -0800
----------------------------------------------------------------------
src/CMakeLists.txt | 2 +-
src/Makefile.am | 4 +-
src/slave/containerizer/isolator.cpp | 124 -------------------
src/slave/containerizer/isolator.hpp | 113 -----------------
src/slave/containerizer/mesos/isolator.cpp | 124 +++++++++++++++++++
src/slave/containerizer/mesos/isolator.hpp | 113 +++++++++++++++++
.../mesos/isolators/cgroups/cpushare.hpp | 2 +-
.../mesos/isolators/cgroups/mem.hpp | 2 +-
.../mesos/isolators/cgroups/perf_event.hpp | 2 +-
.../mesos/isolators/filesystem/linux.hpp | 2 +-
.../mesos/isolators/filesystem/posix.hpp | 2 +-
.../mesos/isolators/filesystem/shared.hpp | 2 +-
.../mesos/isolators/namespaces/pid.hpp | 2 +-
.../mesos/isolators/network/port_mapping.hpp | 2 +-
.../containerizer/mesos/isolators/posix.hpp | 2 +-
.../mesos/isolators/posix/disk.hpp | 2 +-
src/tests/containerizer/isolator.hpp | 2 +-
17 files changed, 251 insertions(+), 251 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cfe9d26..c0d77c7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -195,8 +195,8 @@ if (NOT WIN32)
slave/containerizer/docker.hpp
slave/containerizer/external_containerizer.cpp
slave/containerizer/fetcher.cpp
- slave/containerizer/isolator.cpp
slave/containerizer/mesos/containerizer.cpp
+ slave/containerizer/mesos/isolator.cpp
slave/containerizer/mesos/launch.cpp
slave/containerizer/mesos/launcher.cpp
slave/containerizer/mesos/mount.cpp
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 0409491..e96e0ec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -594,8 +594,8 @@ libmesos_no_3rdparty_la_SOURCES += \
slave/containerizer/docker.cpp \
slave/containerizer/external_containerizer.cpp \
slave/containerizer/fetcher.cpp \
- slave/containerizer/isolator.cpp \
slave/containerizer/mesos/containerizer.cpp \
+ slave/containerizer/mesos/isolator.cpp \
slave/containerizer/mesos/launch.cpp \
slave/containerizer/mesos/launcher.cpp \
slave/containerizer/mesos/mount.cpp \
@@ -700,8 +700,8 @@ libmesos_no_3rdparty_la_SOURCES += \
slave/containerizer/docker.hpp \
slave/containerizer/external_containerizer.hpp \
slave/containerizer/fetcher.hpp \
- slave/containerizer/isolator.hpp \
slave/containerizer/mesos/containerizer.hpp \
+ slave/containerizer/mesos/isolator.hpp \
slave/containerizer/mesos/launch.hpp \
slave/containerizer/mesos/launcher.hpp \
slave/containerizer/mesos/mount.hpp \
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/isolator.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolator.cpp b/src/slave/containerizer/isolator.cpp
deleted file mode 100644
index 6cc9b83..0000000
--- a/src/slave/containerizer/isolator.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <process/dispatch.hpp>
-
-#include "slave/containerizer/isolator.hpp"
-
-using namespace process;
-
-using std::string;
-using std::list;
-
-using mesos::slave::ContainerLimitation;
-using mesos::slave::ContainerPrepareInfo;
-using mesos::slave::ContainerState;
-
-namespace mesos {
-namespace internal {
-namespace slave {
-
-MesosIsolator::MesosIsolator(Owned<MesosIsolatorProcess> _process)
- : process(_process)
-{
- spawn(CHECK_NOTNULL(process.get()));
-}
-
-
-MesosIsolator::~MesosIsolator()
-{
- terminate(process.get());
- wait(process.get());
-}
-
-
-Future<Nothing> MesosIsolator::recover(
- const list<ContainerState>& state,
- const hashset<ContainerID>& orphans)
-{
- return dispatch(process.get(),
- &MesosIsolatorProcess::recover,
- state,
- orphans);
-}
-
-
-Future<Option<ContainerPrepareInfo>> MesosIsolator::prepare(
- const ContainerID& containerId,
- const ExecutorInfo& executorInfo,
- const string& directory,
- const Option<string>& user)
-{
- return dispatch(process.get(),
- &MesosIsolatorProcess::prepare,
- containerId,
- executorInfo,
- directory,
- user);
-}
-
-
-Future<Nothing> MesosIsolator::isolate(
- const ContainerID& containerId,
- pid_t pid)
-{
- return dispatch(process.get(),
- &MesosIsolatorProcess::isolate,
- containerId,
- pid);
-}
-
-
-Future<ContainerLimitation> MesosIsolator::watch(
- const ContainerID& containerId)
-{
- return dispatch(process.get(),
- &MesosIsolatorProcess::watch,
- containerId);
-}
-
-
-Future<Nothing> MesosIsolator::update(
- const ContainerID& containerId,
- const Resources& resources)
-{
- return dispatch(process.get(),
- &MesosIsolatorProcess::update,
- containerId,
- resources);
-}
-
-
-Future<ResourceStatistics> MesosIsolator::usage(
- const ContainerID& containerId)
-{
- return dispatch(process.get(),
- &MesosIsolatorProcess::usage,
- containerId);
-}
-
-
-Future<Nothing> MesosIsolator::cleanup(
- const ContainerID& containerId)
-{
- return dispatch(process.get(),
- &MesosIsolatorProcess::cleanup,
- containerId);
-}
-
-} // namespace slave {
-} // namespace internal {
-} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/isolator.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolator.hpp b/src/slave/containerizer/isolator.hpp
deleted file mode 100644
index 937f253..0000000
--- a/src/slave/containerizer/isolator.hpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef __ISOLATOR_HPP__
-#define __ISOLATOR_HPP__
-
-#include <mesos/slave/isolator.hpp>
-
-#include <process/owned.hpp>
-#include <process/process.hpp>
-
-#include <stout/none.hpp>
-
-namespace mesos {
-namespace internal {
-namespace slave {
-
-// Forward declaration.
-class MesosIsolatorProcess;
-
-
-// A wrapper class that implements the 'Isolator' interface which is
-// backed by an 'MesosIsolatorProcess'. This helper class is useful
-// for programmers to write asynchronous isolators.
-class MesosIsolator : public mesos::slave::Isolator
-{
-public:
- explicit MesosIsolator(process::Owned<MesosIsolatorProcess> process);
- virtual ~MesosIsolator();
-
- virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ContainerState>& states,
- const hashset<ContainerID>& orphans);
-
- virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
- const ContainerID& containerId,
- const ExecutorInfo& executorInfo,
- const std::string& directory,
- const Option<std::string>& user);
-
- virtual process::Future<Nothing> isolate(
- const ContainerID& containerId,
- pid_t pid);
-
- virtual process::Future<mesos::slave::ContainerLimitation> watch(
- const ContainerID& containerId);
-
- virtual process::Future<Nothing> update(
- const ContainerID& containerId,
- const Resources& resources);
-
- virtual process::Future<ResourceStatistics> usage(
- const ContainerID& containerId);
-
- virtual process::Future<Nothing> cleanup(
- const ContainerID& containerId);
-
-private:
- process::Owned<MesosIsolatorProcess> process;
-};
-
-
-class MesosIsolatorProcess : public process::Process<MesosIsolatorProcess>
-{
-public:
- virtual ~MesosIsolatorProcess() {}
-
- virtual process::Future<Nothing> recover(
- const std::list<mesos::slave::ContainerState>& states,
- const hashset<ContainerID>& orphans) = 0;
-
- virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
- const ContainerID& containerId,
- const ExecutorInfo& executorInfo,
- const std::string& directory,
- const Option<std::string>& user) = 0;
-
- virtual process::Future<Nothing> isolate(
- const ContainerID& containerId,
- pid_t pid) = 0;
-
- virtual process::Future<mesos::slave::ContainerLimitation> watch(
- const ContainerID& containerId) = 0;
-
- virtual process::Future<Nothing> update(
- const ContainerID& containerId,
- const Resources& resources) = 0;
-
- virtual process::Future<ResourceStatistics> usage(
- const ContainerID& containerId) = 0;
-
- virtual process::Future<Nothing> cleanup(
- const ContainerID& containerId) = 0;
-};
-
-} // namespace slave {
-} // namespace internal {
-} // namespace mesos {
-
-#endif // __ISOLATOR_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolator.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolator.cpp b/src/slave/containerizer/mesos/isolator.cpp
new file mode 100644
index 0000000..493b5dd
--- /dev/null
+++ b/src/slave/containerizer/mesos/isolator.cpp
@@ -0,0 +1,124 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <process/dispatch.hpp>
+
+#include "slave/containerizer/mesos/isolator.hpp"
+
+using namespace process;
+
+using std::string;
+using std::list;
+
+using mesos::slave::ContainerLimitation;
+using mesos::slave::ContainerPrepareInfo;
+using mesos::slave::ContainerState;
+
+namespace mesos {
+namespace internal {
+namespace slave {
+
+MesosIsolator::MesosIsolator(Owned<MesosIsolatorProcess> _process)
+ : process(_process)
+{
+ spawn(CHECK_NOTNULL(process.get()));
+}
+
+
+MesosIsolator::~MesosIsolator()
+{
+ terminate(process.get());
+ wait(process.get());
+}
+
+
+Future<Nothing> MesosIsolator::recover(
+ const list<ContainerState>& state,
+ const hashset<ContainerID>& orphans)
+{
+ return dispatch(process.get(),
+ &MesosIsolatorProcess::recover,
+ state,
+ orphans);
+}
+
+
+Future<Option<ContainerPrepareInfo>> MesosIsolator::prepare(
+ const ContainerID& containerId,
+ const ExecutorInfo& executorInfo,
+ const string& directory,
+ const Option<string>& user)
+{
+ return dispatch(process.get(),
+ &MesosIsolatorProcess::prepare,
+ containerId,
+ executorInfo,
+ directory,
+ user);
+}
+
+
+Future<Nothing> MesosIsolator::isolate(
+ const ContainerID& containerId,
+ pid_t pid)
+{
+ return dispatch(process.get(),
+ &MesosIsolatorProcess::isolate,
+ containerId,
+ pid);
+}
+
+
+Future<ContainerLimitation> MesosIsolator::watch(
+ const ContainerID& containerId)
+{
+ return dispatch(process.get(),
+ &MesosIsolatorProcess::watch,
+ containerId);
+}
+
+
+Future<Nothing> MesosIsolator::update(
+ const ContainerID& containerId,
+ const Resources& resources)
+{
+ return dispatch(process.get(),
+ &MesosIsolatorProcess::update,
+ containerId,
+ resources);
+}
+
+
+Future<ResourceStatistics> MesosIsolator::usage(
+ const ContainerID& containerId)
+{
+ return dispatch(process.get(),
+ &MesosIsolatorProcess::usage,
+ containerId);
+}
+
+
+Future<Nothing> MesosIsolator::cleanup(
+ const ContainerID& containerId)
+{
+ return dispatch(process.get(),
+ &MesosIsolatorProcess::cleanup,
+ containerId);
+}
+
+} // namespace slave {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolator.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolator.hpp b/src/slave/containerizer/mesos/isolator.hpp
new file mode 100644
index 0000000..937f253
--- /dev/null
+++ b/src/slave/containerizer/mesos/isolator.hpp
@@ -0,0 +1,113 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __ISOLATOR_HPP__
+#define __ISOLATOR_HPP__
+
+#include <mesos/slave/isolator.hpp>
+
+#include <process/owned.hpp>
+#include <process/process.hpp>
+
+#include <stout/none.hpp>
+
+namespace mesos {
+namespace internal {
+namespace slave {
+
+// Forward declaration.
+class MesosIsolatorProcess;
+
+
+// A wrapper class that implements the 'Isolator' interface which is
+// backed by an 'MesosIsolatorProcess'. This helper class is useful
+// for programmers to write asynchronous isolators.
+class MesosIsolator : public mesos::slave::Isolator
+{
+public:
+ explicit MesosIsolator(process::Owned<MesosIsolatorProcess> process);
+ virtual ~MesosIsolator();
+
+ virtual process::Future<Nothing> recover(
+ const std::list<mesos::slave::ContainerState>& states,
+ const hashset<ContainerID>& orphans);
+
+ virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
+ const ContainerID& containerId,
+ const ExecutorInfo& executorInfo,
+ const std::string& directory,
+ const Option<std::string>& user);
+
+ virtual process::Future<Nothing> isolate(
+ const ContainerID& containerId,
+ pid_t pid);
+
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
+ const ContainerID& containerId);
+
+ virtual process::Future<Nothing> update(
+ const ContainerID& containerId,
+ const Resources& resources);
+
+ virtual process::Future<ResourceStatistics> usage(
+ const ContainerID& containerId);
+
+ virtual process::Future<Nothing> cleanup(
+ const ContainerID& containerId);
+
+private:
+ process::Owned<MesosIsolatorProcess> process;
+};
+
+
+class MesosIsolatorProcess : public process::Process<MesosIsolatorProcess>
+{
+public:
+ virtual ~MesosIsolatorProcess() {}
+
+ virtual process::Future<Nothing> recover(
+ const std::list<mesos::slave::ContainerState>& states,
+ const hashset<ContainerID>& orphans) = 0;
+
+ virtual process::Future<Option<mesos::slave::ContainerPrepareInfo>> prepare(
+ const ContainerID& containerId,
+ const ExecutorInfo& executorInfo,
+ const std::string& directory,
+ const Option<std::string>& user) = 0;
+
+ virtual process::Future<Nothing> isolate(
+ const ContainerID& containerId,
+ pid_t pid) = 0;
+
+ virtual process::Future<mesos::slave::ContainerLimitation> watch(
+ const ContainerID& containerId) = 0;
+
+ virtual process::Future<Nothing> update(
+ const ContainerID& containerId,
+ const Resources& resources) = 0;
+
+ virtual process::Future<ResourceStatistics> usage(
+ const ContainerID& containerId) = 0;
+
+ virtual process::Future<Nothing> cleanup(
+ const ContainerID& containerId) = 0;
+};
+
+} // namespace slave {
+} // namespace internal {
+} // namespace mesos {
+
+#endif // __ISOLATOR_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolators/cgroups/cpushare.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/cpushare.hpp b/src/slave/containerizer/mesos/isolators/cgroups/cpushare.hpp
index 5580716..123b9ed 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cpushare.hpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cpushare.hpp
@@ -29,7 +29,7 @@
#include "slave/flags.hpp"
-#include "slave/containerizer/isolator.hpp"
+#include "slave/containerizer/mesos/isolator.hpp"
#include "slave/containerizer/mesos/isolators/cgroups/constants.hpp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolators/cgroups/mem.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/mem.hpp b/src/slave/containerizer/mesos/isolators/cgroups/mem.hpp
index 9d2a48a..0995236 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/mem.hpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/mem.hpp
@@ -30,7 +30,7 @@
#include "slave/flags.hpp"
-#include "slave/containerizer/isolator.hpp"
+#include "slave/containerizer/mesos/isolator.hpp"
namespace mesos {
namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolators/cgroups/perf_event.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/perf_event.hpp b/src/slave/containerizer/mesos/isolators/cgroups/perf_event.hpp
index b8809c4..5eaf49f 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/perf_event.hpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/perf_event.hpp
@@ -26,7 +26,7 @@
#include "slave/flags.hpp"
-#include "slave/containerizer/isolator.hpp"
+#include "slave/containerizer/mesos/isolator.hpp"
namespace mesos {
namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolators/filesystem/linux.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/filesystem/linux.hpp b/src/slave/containerizer/mesos/isolators/filesystem/linux.hpp
index 8f7ff39..b8d47e8 100644
--- a/src/slave/containerizer/mesos/isolators/filesystem/linux.hpp
+++ b/src/slave/containerizer/mesos/isolators/filesystem/linux.hpp
@@ -29,7 +29,7 @@
#include "slave/flags.hpp"
-#include "slave/containerizer/isolator.hpp"
+#include "slave/containerizer/mesos/isolator.hpp"
#include "slave/containerizer/mesos/provisioner/provisioner.hpp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolators/filesystem/posix.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/filesystem/posix.hpp b/src/slave/containerizer/mesos/isolators/filesystem/posix.hpp
index 3241dbc..c3544aa 100644
--- a/src/slave/containerizer/mesos/isolators/filesystem/posix.hpp
+++ b/src/slave/containerizer/mesos/isolators/filesystem/posix.hpp
@@ -21,7 +21,7 @@
#include "slave/flags.hpp"
-#include "slave/containerizer/isolator.hpp"
+#include "slave/containerizer/mesos/isolator.hpp"
namespace mesos {
namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolators/filesystem/shared.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/filesystem/shared.hpp b/src/slave/containerizer/mesos/isolators/filesystem/shared.hpp
index 6b6c8ce..2e45701 100644
--- a/src/slave/containerizer/mesos/isolators/filesystem/shared.hpp
+++ b/src/slave/containerizer/mesos/isolators/filesystem/shared.hpp
@@ -19,7 +19,7 @@
#include "slave/flags.hpp"
-#include "slave/containerizer/isolator.hpp"
+#include "slave/containerizer/mesos/isolator.hpp"
namespace mesos {
namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolators/namespaces/pid.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/namespaces/pid.hpp b/src/slave/containerizer/mesos/isolators/namespaces/pid.hpp
index 7ad6858..c2d1455 100644
--- a/src/slave/containerizer/mesos/isolators/namespaces/pid.hpp
+++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.hpp
@@ -25,7 +25,7 @@
#include "slave/flags.hpp"
-#include "slave/containerizer/isolator.hpp"
+#include "slave/containerizer/mesos/isolator.hpp"
namespace mesos {
namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
index eaea644..cbb9407 100644
--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
@@ -45,7 +45,7 @@
#include "slave/flags.hpp"
-#include "slave/containerizer/isolator.hpp"
+#include "slave/containerizer/mesos/isolator.hpp"
namespace mesos {
namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolators/posix.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/posix.hpp b/src/slave/containerizer/mesos/isolators/posix.hpp
index d683f74..7e1ebc2 100644
--- a/src/slave/containerizer/mesos/isolators/posix.hpp
+++ b/src/slave/containerizer/mesos/isolators/posix.hpp
@@ -26,7 +26,7 @@
#include "slave/flags.hpp"
-#include "slave/containerizer/isolator.hpp"
+#include "slave/containerizer/mesos/isolator.hpp"
#include "usage/usage.hpp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/slave/containerizer/mesos/isolators/posix/disk.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/posix/disk.hpp b/src/slave/containerizer/mesos/isolators/posix/disk.hpp
index 0983676..31808c1 100644
--- a/src/slave/containerizer/mesos/isolators/posix/disk.hpp
+++ b/src/slave/containerizer/mesos/isolators/posix/disk.hpp
@@ -28,7 +28,7 @@
#include "slave/flags.hpp"
#include "slave/state.hpp"
-#include "slave/containerizer/isolator.hpp"
+#include "slave/containerizer/mesos/isolator.hpp"
namespace mesos {
namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/80c45177/src/tests/containerizer/isolator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/isolator.hpp b/src/tests/containerizer/isolator.hpp
index e49bc3a..e4101b1 100644
--- a/src/tests/containerizer/isolator.hpp
+++ b/src/tests/containerizer/isolator.hpp
@@ -19,7 +19,7 @@
#include <gmock/gmock.h>
-#include "slave/containerizer/isolator.hpp"
+#include "slave/containerizer/mesos/isolator.hpp"
namespace mesos {
namespace internal {