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/08/02 16:47:47 UTC
[1/2] mesos git commit: Implemented
`CgroupsIsolatorProcess::finalize`.
Repository: mesos
Updated Branches:
refs/heads/master 74e959848 -> 2eeb98e73
Implemented `CgroupsIsolatorProcess::finalize`.
Review: https://reviews.apache.org/r/50643/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2eeb98e7
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2eeb98e7
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2eeb98e7
Branch: refs/heads/master
Commit: 2eeb98e73495d6b015e7861a2ed0f4b131e8a85b
Parents: cc16d1d
Author: haosdent huang <ha...@gmail.com>
Authored: Tue Aug 2 09:47:20 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Aug 2 09:47:47 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp | 9 +++++++++
src/slave/containerizer/mesos/isolators/cgroups/cgroups.hpp | 2 ++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2eeb98e7/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 e8a0f0e..179eb07 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
@@ -132,6 +132,15 @@ void CgroupsIsolatorProcess::initialize()
}
+void CgroupsIsolatorProcess::finalize()
+{
+ foreachvalue (const Owned<Subsystem>& subsystem, subsystems) {
+ terminate(subsystem.get());
+ wait(subsystem.get());
+ }
+}
+
+
Future<Nothing> CgroupsIsolatorProcess::recover(
const list<ContainerState>& states,
const hashset<ContainerID>& orphans)
http://git-wip-us.apache.org/repos/asf/mesos/blob/2eeb98e7/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 642dfc8..b191b2a 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.hpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.hpp
@@ -81,6 +81,8 @@ public:
protected:
virtual void initialize();
+ virtual void finalize();
+
private:
struct Info
{
[2/2] mesos git commit: Implemented
`CgroupsIsolatorProcess::initialize`.
Posted by ji...@apache.org.
Implemented `CgroupsIsolatorProcess::initialize`.
Review: https://reviews.apache.org/r/50642/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cc16d1dc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cc16d1dc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cc16d1dc
Branch: refs/heads/master
Commit: cc16d1dcdd242d380bcc8d63202d4cb647870475
Parents: 74e9598
Author: haosdent huang <ha...@gmail.com>
Authored: Tue Aug 2 09:47:17 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Aug 2 09:47:47 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp | 8 ++++++++
src/slave/containerizer/mesos/isolators/cgroups/cgroups.hpp | 3 +++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/cc16d1dc/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 5a50a62..e8a0f0e 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.cpp
@@ -124,6 +124,14 @@ Try<Isolator*> CgroupsIsolatorProcess::create(const Flags& flags)
}
+void CgroupsIsolatorProcess::initialize()
+{
+ foreachvalue (const Owned<Subsystem>& subsystem, subsystems) {
+ spawn(subsystem.get());
+ }
+}
+
+
Future<Nothing> CgroupsIsolatorProcess::recover(
const list<ContainerState>& states,
const hashset<ContainerID>& orphans)
http://git-wip-us.apache.org/repos/asf/mesos/blob/cc16d1dc/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 1477b5e..642dfc8 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cgroups.hpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cgroups.hpp
@@ -78,6 +78,9 @@ public:
virtual process::Future<Nothing> cleanup(
const ContainerID& containerId);
+protected:
+ virtual void initialize();
+
private:
struct Info
{