[4/4] mesos git commit: Added Resource::ReservationInfo protobuf message.

[ji...@apache.org]

Added Resource::ReservationInfo protobuf message.

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


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

Branch: refs/heads/master
Commit: 4d1e5b02dc7f1ab3c09f0b0eadf4f72adc149140
Parents: a1cf25c
Author: Michael Park <mc...@gmail.com>
Authored: Sun May 3 11:40:11 2015 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Sun May 3 13:08:43 2015 -0700

----------------------------------------------------------------------
 include/mesos/mesos.proto | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/4d1e5b02/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 967b1e3..db4fc8c 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -113,8 +113,8 @@ message ContainerID {
  * automagically set it to the current hostname.
  * The principal field should match the credential the framework uses
  * in authentication. This field is used for framework API rate
- * exporting and limiting and should be set even if authentication is
- * not enabled if these features are desired.
+ * exporting/limiting and dynamic reservations. It should be set even
+ * if authentication is not enabled if these features are desired.
  * The webui_url field allows a framework to advertise its web UI, so
  * that the Mesos web UI can link to it. It is expected to be a full
  * URL, for example http://my-scheduler.example.com:8080/.
@@ -394,6 +394,28 @@ message Resource {
   optional Value.Set set = 5;
   optional string role = 6 [default = "*"];
 
+  message ReservationInfo {
+    // Describes a dynamic reservation. A dynamic reservation is
+    // acquired by an operator via the '/reserve' HTTP endpoint or by
+    // a framework via the offer cycle by sending back an
+    // 'Offer::Operation::Reserve' message.
+    // NOTE: We currently do not allow frameworks with role "*" to
+    // make dynamic reservations.
+
+    // This field indicates the principal of the operator or framework
+    // that reserved this resource. It is used in conjunction with the
+    // "unreserve" ACL to determine whether the entity attempting to
+    // unreserve this resource is permitted to do so.
+    // NOTE: This field should match the FrameworkInfo.principal of
+    // the framework that reserved this resource.
+    required string principal = 1;
+  }
+
+  // If this is set, this resource was dynamically reserved by an
+  // operator or a framework. Otherwise, this resource is either unreserved
+  // or statically reserved by an operator via the --resources flag.
+  optional ReservationInfo reservation = 8;
+
   message DiskInfo {
     // Describes a persistent disk volume.
     // A persistent disk volume will not be automatically garbage