Marked the pid namespace isolator as nesting aware. Review: https://reviews.apache.org/r/51981
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/82210215 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/82210215 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/82210215 Branch: refs/heads/master Commit: 8221021580ff1968b2b44d878e8c523bf77d5d6d Parents: 63004cc Author: Jie Yu <yujie....@gmail.com> Authored: Fri Sep 16 18:25:58 2016 -0700 Committer: Jie Yu <yujie....@gmail.com> Committed: Sat Sep 17 13:02:37 2016 -0700 ---------------------------------------------------------------------- src/slave/containerizer/mesos/isolators/namespaces/pid.cpp | 6 ++++++ src/slave/containerizer/mesos/isolators/namespaces/pid.hpp | 2 ++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/82210215/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp index e330bb6..0d9ec57 100644 --- a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp +++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp @@ -68,6 +68,12 @@ NamespacesPidIsolatorProcess::NamespacesPidIsolatorProcess() : ProcessBase(process::ID::generate("pid-namespace-isolator")) {} +bool NamespacesPidIsolatorProcess::supportsNesting() +{ + return true; +} + + Future<Option<ContainerLaunchInfo>> NamespacesPidIsolatorProcess::prepare( const ContainerID& containerId, const ContainerConfig& containerConfig) http://git-wip-us.apache.org/repos/asf/mesos/blob/82210215/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 ccb525a..2b316db 100644 --- a/src/slave/containerizer/mesos/isolators/namespaces/pid.hpp +++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.hpp @@ -32,6 +32,8 @@ public: virtual ~NamespacesPidIsolatorProcess() {} + virtual bool supportsNesting(); + virtual process::Future<Option<mesos::slave::ContainerLaunchInfo>> prepare( const ContainerID& containerId, const mesos::slave::ContainerConfig& containerConfig);
