You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gi...@apache.org on 2018/06/25 21:43:36 UTC
[5/5] mesos git commit: Removed an unused member variable
`hierarchies` from cgroups isolator.
Removed an unused member variable `hierarchies` from cgroups isolator.
Review: https://reviews.apache.org/r/67673/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/00b68881
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/00b68881
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/00b68881
Branch: refs/heads/master
Commit: 00b688815be6f3d429b2035e7e926a56f00fd18b
Parents: 5feaad6
Author: Qian Zhang <zh...@gmail.com>
Authored: Mon Jun 25 14:39:48 2018 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Mon Jun 25 14:41:48 2018 -0700
----------------------------------------------------------------------
.../containerizer/mesos/isolators/cgroups/cgroups.cpp | 13 +------------
.../containerizer/mesos/isolators/cgroups/cgroups.hpp | 4 ----
2 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/00b68881/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 316d2c0..8fba6f9 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
@@ -60,11 +60,9 @@ namespace slave {
CgroupsIsolatorProcess::CgroupsIsolatorProcess(
const Flags& _flags,
- const hashmap<string, string>& _hierarchies,
const multihashmap<string, Owned<Subsystem>>& _subsystems)
: ProcessBase(process::ID::generate("cgroups-isolator")),
flags(_flags),
- hierarchies(_hierarchies),
subsystems(_subsystems) {}
@@ -73,9 +71,6 @@ CgroupsIsolatorProcess::~CgroupsIsolatorProcess() {}
Try<Isolator*> CgroupsIsolatorProcess::create(const Flags& flags)
{
- // Subsystem name -> hierarchy path.
- hashmap<string, string> hierarchies;
-
// Hierarchy path -> subsystem object.
multihashmap<string, Owned<Subsystem>> subsystems;
@@ -153,11 +148,6 @@ Try<Isolator*> CgroupsIsolatorProcess::create(const Flags& flags)
CHECK(!subsystemSet.empty());
foreach (const string& subsystemName, subsystemSet) {
- if (hierarchies.contains(subsystemName)) {
- // Skip when the subsystem exists.
- continue;
- }
-
// Prepare hierarchy if it does not exist.
Try<string> hierarchy = cgroups::prepare(
flags.cgroups_hierarchy,
@@ -181,11 +171,10 @@ Try<Isolator*> CgroupsIsolatorProcess::create(const Flags& flags)
}
subsystems.put(hierarchy.get(), subsystem.get());
- hierarchies.put(subsystemName, hierarchy.get());
}
Owned<MesosIsolatorProcess> process(
- new CgroupsIsolatorProcess(flags, hierarchies, subsystems));
+ new CgroupsIsolatorProcess(flags, subsystems));
return new MesosIsolator(process);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/00b68881/src/slave/containerizer/mesos/isolators/cgroups/cgroups.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.hpp b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.hpp
index 480aedf..cde1ace 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.hpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.hpp
@@ -101,7 +101,6 @@ private:
CgroupsIsolatorProcess(
const Flags& _flags,
- const hashmap<std::string, std::string>& _hierarchies,
const multihashmap<std::string, process::Owned<Subsystem>>&
_subsystems);
@@ -150,9 +149,6 @@ private:
const Flags flags;
- // Map from subsystem name to hierarchy path.
- hashmap<std::string, std::string> hierarchies;
-
// We map hierarchy path and `Subsystem` in subsystems. Same hierarchy may
// map to multiple Subsystems. For example, our cgroups hierarchies may
// mount like below in the machine: