You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by id...@apache.org on 2014/06/02 22:28:11 UTC
git commit: Ignore slave cgroup during isolator recovery.
Repository: mesos
Updated Branches:
refs/heads/master c5a336420 -> 4feeb9eea
Ignore slave cgroup during isolator recovery.
Do not consider the slave cgroup (from --slave_subsystems) as an orphan
during recover().
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4feeb9ee
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4feeb9ee
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4feeb9ee
Branch: refs/heads/master
Commit: 4feeb9eeadafe0fdf7d037582fa69b958a22bf75
Parents: c5a3364
Author: Ian Downes <id...@twitter.com>
Authored: Mon Jun 2 11:44:47 2014 -0700
Committer: Ian Downes <id...@twitter.com>
Committed: Mon Jun 2 13:27:48 2014 -0700
----------------------------------------------------------------------
.../containerizer/isolators/cgroups/cpushare.cpp | 14 ++++++++++++++
src/slave/containerizer/isolators/cgroups/mem.cpp | 7 +++++++
2 files changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4feeb9ee/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 b494a92..47a61af 100644
--- a/src/slave/containerizer/isolators/cgroups/cpushare.cpp
+++ b/src/slave/containerizer/isolators/cgroups/cpushare.cpp
@@ -167,6 +167,13 @@ Future<Nothing> CgroupsCpushareIsolatorProcess::recover(
}
foreach (const string& orphan, orphans.get()) {
+ // Ignore the slave cgroup (see the --slave_subsystems flag).
+ // TODO(idownes): Remove this when the cgroups layout is updated,
+ // see MESOS-1185.
+ if (orphan == path::join(flags.cgroups_root, "slave")) {
+ continue;
+ }
+
if (!cgroups.contains(orphan)) {
LOG(INFO) << "Removing orphaned cgroup"
<< " '" << path::join("cpu", orphan) << "'";
@@ -185,6 +192,13 @@ Future<Nothing> CgroupsCpushareIsolatorProcess::recover(
}
foreach (const string& orphan, orphans.get()) {
+ // Ignore the slave cgroup (see the --slave_subsystems flag).
+ // TODO(idownes): Remove this when the cgroups layout is updated,
+ // see MESOS-1185.
+ if (orphan == path::join(flags.cgroups_root, "slave")) {
+ continue;
+ }
+
if (!cgroups.contains(orphan)) {
LOG(INFO) << "Removing orphaned cgroup"
<< " '" << path::join("cpuacct", orphan) << "'";
http://git-wip-us.apache.org/repos/asf/mesos/blob/4feeb9ee/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 6324dcd..f2509ad 100644
--- a/src/slave/containerizer/isolators/cgroups/mem.cpp
+++ b/src/slave/containerizer/isolators/cgroups/mem.cpp
@@ -161,6 +161,13 @@ Future<Nothing> CgroupsMemIsolatorProcess::recover(
}
foreach (const string& orphan, orphans.get()) {
+ // Ignore the slave cgroup (see the --slave_subsystems flag).
+ // TODO(idownes): Remove this when the cgroups layout is updated,
+ // see MESOS-1185.
+ if (orphan == path::join(flags.cgroups_root, "slave")) {
+ continue;
+ }
+
if (!cgroups.contains(orphan)) {
LOG(INFO) << "Removing orphaned cgroup '" << orphan << "'";
cgroups::destroy(hierarchy, orphan);