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/01/28 22:40:27 UTC

mesos git commit: Added the CgroupInfo protobuf.

Repository: mesos
Updated Branches:
  refs/heads/master 05533f43f -> d5af57a64


Added the CgroupInfo protobuf.

The agent can use this message to reflect any cgroup configuration that
might have been applied to a container.

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


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

Branch: refs/heads/master
Commit: d5af57a64aff4123612ff15afb2261631f59b49c
Parents: 05533f4
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Thu Jan 28 10:40:59 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Jan 28 13:40:23 2016 -0800

----------------------------------------------------------------------
 include/mesos/mesos.proto    | 24 ++++++++++++++++++++++--
 include/mesos/v1/mesos.proto | 25 +++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/d5af57a6/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 96b911f..f45795e 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -1546,12 +1546,32 @@ message ContainerInfo {
 
 
 /**
- * Container related information that is resolved during container setup. The
- * information is sent back to the framework as part of the TaskStatus message.
+ * Container related information that is resolved during container
+ * setup. The information is sent back to the framework as part of the
+ * TaskStatus message.
  */
 message ContainerStatus {
   // This field can be reliably used to identify the container IP address.
   repeated NetworkInfo network_infos = 1;
+
+  // Information about Linux control group (cgroup).
+  optional CgroupInfo cgroup_info = 2;
+}
+
+
+/**
+ * Linux control group (cgroup) information.
+ */
+message CgroupInfo {
+  message NetCls {
+    // The 32-bit classid consists of two parts, a 16 bit major handle
+    // and a 16-bit minor handle. The major and minor handle are
+    // represented using the format 0xAAAABBBB, where 0xAAAA is the
+    // 16-bit major handle and 0xBBBB is the 16-bit minor handle.
+    optional uint32 classid = 1;
+  }
+
+  optional NetCls net_cls = 1;
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/d5af57a6/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index 0501dfa..1102bbc 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -1545,12 +1545,33 @@ message ContainerInfo {
 
 
 /**
- * Container related information that is resolved during container setup. The
- * information is sent back to the framework as part of the TaskStatus message.
+ * Container related information that is resolved during container
+ * setup. The information is sent back to the framework as part of the
+ * TaskStatus message.
  */
 message ContainerStatus {
   // This field can be reliably used to identify the container IP address.
   repeated NetworkInfo network_infos = 1;
+
+  // Information about Linux control group (cgroup).
+  optional CgroupInfo cgroup_info = 2;
+}
+
+
+/**
+ * Linux control group (cgroup) information.
+ */
+message CgroupInfo {
+  // Configuration of a net_cls cgroup subsystem.
+  message NetCls {
+    // The 32-bit classid consists of two parts, a 16 bit major handle
+    // and a 16-bit minor handle. The major and minor handle are
+    // represented using the format 0xAAAABBBB, where 0xAAAA is the
+    // 16-bit major handle and 0xBBBB is the 16-bit minor handle.
+    optional uint32 classid = 1;
+  }
+
+  optional NetCls net_cls = 1;
 }