You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2017/08/16 00:49:45 UTC
[5/7] mesos git commit: Added `kill()` call to the composing
containerizer.
Added `kill()` call to the composing containerizer.
Review: https://reviews.apache.org/r/61571/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8c8e2af5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8c8e2af5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8c8e2af5
Branch: refs/heads/master
Commit: 8c8e2af56457346af586e94f071bfa14a92eb20a
Parents: 8b3fd24
Author: Anand Mazumdar <an...@apache.org>
Authored: Tue Aug 15 17:38:04 2017 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Tue Aug 15 17:48:39 2017 -0700
----------------------------------------------------------------------
src/slave/containerizer/composing.cpp | 25 +++++++++++++++++++++++++
src/slave/containerizer/composing.hpp | 4 ++++
2 files changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8c8e2af5/src/slave/containerizer/composing.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/composing.cpp b/src/slave/containerizer/composing.cpp
index a003e1b..f1a9c3d 100644
--- a/src/slave/containerizer/composing.cpp
+++ b/src/slave/containerizer/composing.cpp
@@ -89,6 +89,8 @@ public:
Future<bool> destroy(const ContainerID& containerId);
+ Future<bool> kill(const ContainerID& containerId, int signal);
+
Future<hashset<ContainerID>> containers();
Future<Nothing> remove(const ContainerID& containerId);
@@ -232,6 +234,17 @@ Future<bool> ComposingContainerizer::destroy(const ContainerID& containerId)
}
+Future<bool> ComposingContainerizer::kill(
+ const ContainerID& containerId,
+ int signal)
+{
+ return dispatch(process,
+ &ComposingContainerizerProcess::kill,
+ containerId,
+ signal);
+}
+
+
Future<hashset<ContainerID>> ComposingContainerizer::containers()
{
return dispatch(process, &ComposingContainerizerProcess::containers);
@@ -630,6 +643,18 @@ Future<bool> ComposingContainerizerProcess::destroy(
}
+Future<bool> ComposingContainerizerProcess::kill(
+ const ContainerID& containerId,
+ int signal)
+{
+ if (!containers_.contains(containerId)) {
+ return false;
+ }
+
+ return containers_.at(containerId)->containerizer->kill(containerId, signal);
+}
+
+
Future<hashset<ContainerID>> ComposingContainerizerProcess::containers()
{
return containers_.keys();
http://git-wip-us.apache.org/repos/asf/mesos/blob/8c8e2af5/src/slave/containerizer/composing.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/composing.hpp b/src/slave/containerizer/composing.hpp
index bef6d88..06d68ee 100644
--- a/src/slave/containerizer/composing.hpp
+++ b/src/slave/containerizer/composing.hpp
@@ -78,6 +78,10 @@ public:
virtual process::Future<bool> destroy(const ContainerID& containerId);
+ virtual process::Future<bool> kill(
+ const ContainerID& containerId,
+ int signal);
+
virtual process::Future<hashset<ContainerID>> containers();
virtual process::Future<Nothing> remove(const ContainerID& containerId);