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/02/06 04:55:59 UTC
[2/2] mesos git commit: Passed agent flag
--cgroup_net_cls_primary_handle to net_cls isolator.
Passed agent flag --cgroup_net_cls_primary_handle to net_cls isolator.
Review: https://reviews.apache.org/r/43107
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/af0bb896
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/af0bb896
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/af0bb896
Branch: refs/heads/master
Commit: af0bb8969117503fcc4936727f7bc355d14fcbee
Parents: 717393b
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Fri Feb 5 19:33:36 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Feb 5 19:33:36 2016 -0800
----------------------------------------------------------------------
.../mesos/isolators/cgroups/net_cls.cpp | 22 ++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/af0bb896/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp b/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
index f918c66..fd67409 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
@@ -233,11 +233,29 @@ Try<Isolator*> CgroupsNetClsIsolatorProcess::create(const Flags& flags)
}
}
- Owned<MesosIsolatorProcess> process(
+ IntervalSet<uint16_t> primaries;
+
+ if (flags.cgroups_net_cls_primary_handle.isSome()) {
+ Try<uint16_t> primary = numify<uint16_t>(
+ flags.cgroups_net_cls_primary_handle.get());
+
+ if (primary.isError()) {
+ return Error(
+ "Failed to parse the primary handle '" +
+ flags.cgroups_net_cls_primary_handle.get() +
+ "' set in flag --cgroups_net_cls_primary_handle");
+ }
+
+ primaries +=
+ (Bound<uint16_t>::closed(primary.get()),
+ Bound<uint16_t>::closed(primary.get()));
+ }
+
+ process::Owned<MesosIsolatorProcess> process(
new CgroupsNetClsIsolatorProcess(
flags,
hierarchy.get(),
- IntervalSet<uint16_t>()));
+ primaries));
return new MesosIsolator(process);
}