git commit: Updated containerizer.proto's Launch message, added Destroy-, Wait- and Usage-messages.

[nn...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 63595c232 -> e97a11b36


Updated containerizer.proto's Launch message, added Destroy-, Wait- and Usage-messages.

Updated Launch message to reflect latest commits on the TaskInfo
related containerizer Launch call/s.  Added Destroy, Wait and Usage
messages to allow extending those messages in the future, where
needed.

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


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

Branch: refs/heads/master
Commit: e97a11b36441a83c1fce4d89f4a900732b43cae5
Parents: 63595c2
Author: Till Toenshoff <to...@me.com>
Authored: Thu Apr 24 13:31:50 2014 -0700
Committer: Niklas Q. Nielsen <ni...@mesosphere.io>
Committed: Thu Apr 24 13:31:50 2014 -0700

----------------------------------------------------------------------
 include/mesos/containerizer/containerizer.proto | 45 ++++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/e97a11b3/include/mesos/containerizer/containerizer.proto
----------------------------------------------------------------------
diff --git a/include/mesos/containerizer/containerizer.proto b/include/mesos/containerizer/containerizer.proto
index 6ecd82e..c926a7f 100644
--- a/include/mesos/containerizer/containerizer.proto
+++ b/include/mesos/containerizer/containerizer.proto
@@ -25,23 +25,24 @@ option java_outer_classname = "Protos";
 
 
 /**
- * Information about a containerized task launch, sent by slave to the containerizer.
+ * Encodes the launch command sent to the external containerizer
+ * program.
  */
 message Launch {
   required ContainerID container_id = 1;
-  required TaskInfo task = 2;
-  optional FrameworkID framework_id = 3;
+  optional TaskInfo task_info = 2;
+  optional ExecutorInfo executor_info = 3;
   optional string directory = 4;
   optional string user = 5;
   optional SlaveID slave_id = 6;
   optional string slave_pid = 7;
   optional bool checkpoint = 8;
-  optional string mesos_executor_path = 9;
 }
 
 
 /**
- * Information about a containerizer update, sent by slave to the containerizer.
+ * Encodes the update command sent to the external containerizer
+ * program.
  */
 message Update {
   required ContainerID container_id = 1;
@@ -50,11 +51,39 @@ message Update {
 
 
 /**
- * Information about a container termination, returned by the containerizer to the slave.
+ * Encodes the wait command sent to the external containerizer
+ * program.
+ */
+message Wait {
+  required ContainerID container_id = 1;
+}
+
+
+/**
+ * Encodes the destroy command sent to the external containerizer
+ * program.
+ */
+message Destroy {
+  required ContainerID container_id = 1;
+}
+
+
+/**
+ * Encodes the usage command sent to the external containerizer
+ * program.
+ */
+message Usage {
+  required ContainerID container_id = 1;
+}
+
+
+/**
+ * Information about a container termination, returned by the
+ * containerizer to the slave.
  */
 message Termination {
-  // A container may be killed if it exceeds its resources; this will be
-  // indicated by killed=true and described by the message string.
+  // A container may be killed if it exceeds its resources; this will
+  // be indicated by killed=true and described by the message string.
   required bool killed = 1;
   required string message = 2;