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/17 00:50:32 UTC

[1/2] mesos git commit: Defined `status` method for `ComposingContainerizer`.

Repository: mesos
Updated Branches:
  refs/heads/master 195464c3f -> 74c503658


Defined `status` method for `ComposingContainerizer`.

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


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

Branch: refs/heads/master
Commit: d208662cc439f44bd395371b7dada9e341225193
Parents: 195464c
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Tue Feb 16 15:50:10 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Feb 16 15:50:10 2016 -0800

----------------------------------------------------------------------
 src/slave/containerizer/composing.hpp | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/d208662c/src/slave/containerizer/composing.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/composing.hpp b/src/slave/containerizer/composing.hpp
index 6b8757e..f3eebd1 100644
--- a/src/slave/containerizer/composing.hpp
+++ b/src/slave/containerizer/composing.hpp
@@ -80,6 +80,9 @@ public:
   virtual process::Future<ResourceStatistics> usage(
       const ContainerID& containerId);
 
+  virtual process::Future<ContainerStatus> status(
+      const ContainerID& containerId);
+
   virtual process::Future<containerizer::Termination> wait(
       const ContainerID& containerId);
 


[2/2] mesos git commit: Implemented `status` method in `ComposingContainerizer`.

Posted by ji...@apache.org.
Implemented `status` method in `ComposingContainerizer`.

This method will be used by the agent to retrieve `ContainerStatus` from
the `Containerizer`, that was responsible for launching the container.

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


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

Branch: refs/heads/master
Commit: 74c503658489293ed78c8abc493c36472431303f
Parents: d208662
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Tue Feb 16 15:50:13 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Feb 16 15:50:13 2016 -0800

----------------------------------------------------------------------
 src/slave/containerizer/composing.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/74c50365/src/slave/containerizer/composing.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/composing.cpp b/src/slave/containerizer/composing.cpp
index f0a7bba..15d059f 100644
--- a/src/slave/containerizer/composing.cpp
+++ b/src/slave/containerizer/composing.cpp
@@ -81,6 +81,9 @@ public:
   Future<ResourceStatistics> usage(
       const ContainerID& containerId);
 
+  Future<ContainerStatus> status(
+      const ContainerID& containerId);
+
   Future<containerizer::Termination> wait(
       const ContainerID& containerId);
 
@@ -221,6 +224,13 @@ Future<ResourceStatistics> ComposingContainerizer::usage(
 }
 
 
+Future<ContainerStatus> ComposingContainerizer::status(
+    const ContainerID& containerId)
+{
+  return dispatch(process, &ComposingContainerizerProcess::status, containerId);
+}
+
+
 Future<containerizer::Termination> ComposingContainerizer::wait(
     const ContainerID& containerId)
 {
@@ -496,6 +506,17 @@ Future<ResourceStatistics> ComposingContainerizerProcess::usage(
 }
 
 
+Future<ContainerStatus> ComposingContainerizerProcess::status(
+    const ContainerID& containerId)
+{
+  if (!containers_.contains(containerId)) {
+    return Failure("Container " + containerId.value() + " not found");
+  }
+
+  return containers_[containerId]->containerizer->status(containerId);
+}
+
+
 Future<containerizer::Termination> ComposingContainerizerProcess::wait(
     const ContainerID& containerId)
 {