Repository: mesos Updated Branches: refs/heads/master 29e4afdd9 -> 8faab467b
Define MNT_DETACH for pid isolator. MNT_DETACH (since Linux 2.4.11) may not be defined in older <sys/mount.h>. Review: https://reviews.apache.org/r/27341 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8faab467 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8faab467 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8faab467 Branch: refs/heads/master Commit: 8faab467bb562acd53c01ba9ede269ca2c6fe283 Parents: 29e4afd Author: Ian Downes <[email protected]> Authored: Wed Oct 29 11:14:12 2014 -0700 Committer: Ian Downes <[email protected]> Committed: Wed Oct 29 11:17:42 2014 -0700 ---------------------------------------------------------------------- src/slave/containerizer/isolators/namespaces/pid.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8faab467/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 5a13a6d..edfb1f6 100644 --- a/src/slave/containerizer/isolators/namespaces/pid.cpp +++ b/src/slave/containerizer/isolators/namespaces/pid.cpp @@ -16,6 +16,8 @@ * limitations under the License. */ +#include <sys/mount.h> + #include <list> #include <set> #include <string> @@ -230,6 +232,12 @@ Future<ResourceStatistics> NamespacesPidIsolatorProcess::usage( } +// An old glibc might not have this symbol. +#ifndef MNT_DETACH +#define MNT_DETACH 2 +#endif + + Future<Nothing> NamespacesPidIsolatorProcess::cleanup( const ContainerID& containerId) {
