You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by qi...@apache.org on 2019/12/30 01:27:50 UTC
[mesos] branch master updated (d46ae94 -> 4de6f26)
This is an automated email from the ASF dual-hosted git repository.
qianzhang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git.
from d46ae94 Autotools: Added USE_LIBEVENT definition.
new 33a4f58 Added resource limits into `TaskInfo`.
new 968ff95 Added the `share_cgroups` field into `LinuxInfo`.
new 4de6f26 Added resource limits into `ContainerConfig`.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
include/mesos/mesos.proto | 18 ++++++++++++++++++
include/mesos/slave/containerizer.proto | 5 ++++-
include/mesos/v1/mesos.proto | 18 ++++++++++++++++++
3 files changed, 40 insertions(+), 1 deletion(-)
[mesos] 01/03: Added resource limits into `TaskInfo`.
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qianzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 33a4f5883066a235ea45bcf1b8b287e77f74fbec
Author: Qian Zhang <zh...@gmail.com>
AuthorDate: Tue Dec 3 21:36:01 2019 +0800
Added resource limits into `TaskInfo`.
Review: https://reviews.apache.org/r/71855
---
include/mesos/mesos.proto | 3 +++
include/mesos/v1/mesos.proto | 3 +++
2 files changed, 6 insertions(+)
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 7d77ddd..e48d6f3 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -2283,6 +2283,9 @@ message TaskInfo {
// It is the executor's responsibility to implement this, so it might not be
// supported by all custom executors.
optional DurationInfo max_completion_time = 14;
+
+ // Resource limits associated with the task.
+ map<string, Value.Scalar> limits = 15;
}
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index 7abb6ba..9533261 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -2272,6 +2272,9 @@ message TaskInfo {
// It is the executor's responsibility to implement this, so it might not be
// supported by all custom executors.
optional DurationInfo max_completion_time = 14;
+
+ // Resource limits associated with the task.
+ map<string, Value.Scalar> limits = 15;
}
[mesos] 03/03: Added resource limits into `ContainerConfig`.
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qianzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 4de6f2698c6a0a79cc3bdc254f938a4c4ee65160
Author: Qian Zhang <zh...@gmail.com>
AuthorDate: Tue Dec 3 21:36:50 2019 +0800
Added resource limits into `ContainerConfig`.
Review: https://reviews.apache.org/r/71856
---
include/mesos/slave/containerizer.proto | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/mesos/slave/containerizer.proto b/include/mesos/slave/containerizer.proto
index 8b1a268..340268b 100644
--- a/include/mesos/slave/containerizer.proto
+++ b/include/mesos/slave/containerizer.proto
@@ -136,11 +136,14 @@ message ContainerConfig {
// same across all fields.
optional ContainerInfo container_info = 12;
- // Resources associated with the container during launch.
+ // Resource requests associated with the container during launch.
// When either `task_info` or `executor_info` are specified, this will
// always be the sum of the Resources within those fields.
repeated Resource resources = 13;
+ // Resource limits associated with the container during launch.
+ map<string, Value.Scalar> limits = 16;
+
// The class of container being launched. Used by isolators to
// perform different operations depending on the class.
optional ContainerClass container_class = 14;
[mesos] 02/03: Added the `share_cgroups` field into `LinuxInfo`.
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qianzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 968ff95cd4ad51359e3fcb19c2c6f6984a941ae8
Author: Qian Zhang <zh...@gmail.com>
AuthorDate: Fri Dec 20 09:42:50 2019 +0800
Added the `share_cgroups` field into `LinuxInfo`.
Review: https://reviews.apache.org/r/71931
---
include/mesos/mesos.proto | 15 +++++++++++++++
include/mesos/v1/mesos.proto | 15 +++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index e48d6f3..b0f5905 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -3342,6 +3342,21 @@ message LinuxInfo {
// note that we only support setting this field when the `ipc_mode` field is
// set to `PRIVATE` otherwise the container launch will be rejected.
optional uint32 shm_size = 7;
+
+ // If set as 'true', the container will share the cgroups from its parent
+ // container, otherwise it will have its own cgroups created. Please note:
+ // 1. This field should be only used for the task containers in a task group
+ // (i.e., the 1st level nested containers). It will be ignored for the
+ // executor containers (i.e., the top-level containers) since the executor
+ // container will always have its own cgroups created, and it will also be
+ // ignored for the nested containers under the 1st nested container (e.g.,
+ // the debug container running as 2nd level nested container) since those
+ // containers should always share cgroups from its parent container.
+ // 2. The value of this field should be same for all the tasks launched by a
+ // single executor.
+ // 3. It is not allowed to set resource limits for the task which has this
+ // field set as true.
+ optional bool share_cgroups = 8 [default = true];
}
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index 9533261..53a7b9b 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -3331,6 +3331,21 @@ message LinuxInfo {
// note that we only support setting this field when the `ipc_mode` field is
// set to `PRIVATE` otherwise the container launch will be rejected.
optional uint32 shm_size = 7;
+
+ // If set as 'true', the container will share the cgroups from its parent
+ // container, otherwise it will have its own cgroups created. Please note:
+ // 1. This field should be only used for the task containers in a task group
+ // (i.e., the 1st level nested containers). It will be ignored for the
+ // executor containers (i.e., the top-level containers) since the executor
+ // container will always have its own cgroups created, and it will also be
+ // ignored for the nested containers under the 1st nested container (e.g.,
+ // the debug container running as 2nd level nested container) since those
+ // containers should always share cgroups from its parent container.
+ // 2. The value of this field should be same for all the tasks launched by a
+ // single executor.
+ // 3. It is not allowed to set resource limits for the task which has this
+ // field set as true.
+ optional bool share_cgroups = 8 [default = true];
}