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 2016/09/04 19:20:49 UTC

mesos git commit: Disallowed unknown cgroups isolator.

Repository: mesos
Updated Branches:
  refs/heads/master e7e47529f -> 3a5b5ade2


Disallowed unknown cgroups isolator.

Review: https://reviews.apache.org/r/51091/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3a5b5ade
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3a5b5ade
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3a5b5ade

Branch: refs/heads/master
Commit: 3a5b5ade23e9dff2ec293fe9bc5fd63eb15f792f
Parents: e7e4752
Author: haosdent huang <ha...@gmail.com>
Authored: Sun Sep 4 12:20:43 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Sun Sep 4 12:20:43 2016 -0700

----------------------------------------------------------------------
 src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/3a5b5ade/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
index ae5d49f..8bab3f1 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
@@ -89,6 +89,11 @@ Try<Isolator*> CgroupsIsolatorProcess::create(const Flags& flags)
 
     isolator = strings::remove(isolator, "cgroups/", strings::Mode::PREFIX);
 
+    if (!isolatorMap.contains(isolator)) {
+      return Error(
+          "Unknown or unsupported isolator 'cgroups/" + isolator + "'");
+    }
+
     // A cgroups isolator name may map to multiple subsystems. We need to
     // convert the isolator name to its associated subsystems.
     foreach (const string& subsystemName, isolatorMap.get(isolator)) {