You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2015/12/08 04:13:08 UTC
[1/2] mesos git commit: Add volume driver plugin to mesos v1 proto.
Repository: mesos
Updated Branches:
refs/heads/master d46e1aed7 -> 661302966
Add volume driver plugin to mesos v1 proto.
Review: https://reviews.apache.org/r/40888
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/66130296
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/66130296
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/66130296
Branch: refs/heads/master
Commit: 6613029663719fb9798112e2f7f008f6cf54546c
Parents: 3dd8bdf
Author: Gilbert Song <so...@gmail.com>
Authored: Tue Dec 8 04:00:30 2015 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Tue Dec 8 04:12:45 2015 +0100
----------------------------------------------------------------------
include/mesos/v1/mesos.proto | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/66130296/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index 7e96512..8f357b0 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -1505,6 +1505,9 @@ message ContainerInfo {
// pull the docker image from the registry even if the image
// is already downloaded on the agent.
optional bool force_pull_image = 6;
+
+ // The name of volume driver plugin.
+ optional string volume_driver = 7;
}
message MesosInfo {
[2/2] mesos git commit: Made v1 API in mesos.proto equivalent to
non-v1 for 0.26.0.
Posted by ti...@apache.org.
Made v1 API in mesos.proto equivalent to non-v1 for 0.26.0.
Copied missing feature updates to v1 from include/mesos/mesos.proto.
This is a revised version of RR 41046 by Bernd Matthiske.
Review: https://reviews.apache.org/r/41060
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3dd8bdfe
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3dd8bdfe
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3dd8bdfe
Branch: refs/heads/master
Commit: 3dd8bdfe649a5c672d729e905c863357fb0459c4
Parents: d46e1ae
Author: Till Toenshoff <to...@me.com>
Authored: Tue Dec 8 03:48:03 2015 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Tue Dec 8 04:12:45 2015 +0100
----------------------------------------------------------------------
include/mesos/v1/mesos.proto | 40 ++++++++++++++++++++++++++++++++-------
1 file changed, 33 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3dd8bdfe/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index 30b720a..7e96512 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -764,6 +764,7 @@ message ResourceStatistics {
optional uint64 mem_mapped_file_bytes = 12;
// This is only set if swap is enabled.
optional uint64 mem_swap_bytes = 40;
+ optional uint64 mem_unevictable_bytes = 41;
// Number of occurrences of different levels of memory pressure
// events reported by memory cgroup. Pressure listening (re)starts
@@ -822,6 +823,9 @@ message ResourceUsage {
// Current resource usage. If absent, the containerizer
// cannot provide resource usage.
optional ResourceStatistics statistics = 3;
+
+ // The container id for the executor specified in the executor_info field.
+ required ContainerID container_id = 4;
}
repeated Executor executors = 1;
@@ -1175,6 +1179,10 @@ message TaskStatus {
// labels should be used to tag TaskStatus message with light-weight
// meta-data.
optional Labels labels = 12;
+
+ // Container related information that is resolved dynamically such as
+ // network address.
+ optional ContainerStatus container_status = 13;
}
@@ -1306,7 +1314,7 @@ message Image {
// Protobuf for specifying an Appc container image. See:
// https://github.com/appc/spec/blob/master/spec/aci.md
- message AppC {
+ message Appc {
// The name of the image.
required string name = 1;
@@ -1314,7 +1322,7 @@ message Image {
// "hash" is the hash algorithm used and "value" is the hex
// encoded string of the digest. Currently the only permitted
// hash algorithm is sha512.
- required string id = 2;
+ optional string id = 2;
// Optional labels. Suggested labels: "version", "os", and "arch".
optional Labels labels = 3;
@@ -1332,7 +1340,7 @@ message Image {
// Only one of the following image messages should be set to match
// the type.
- optional AppC appc = 2;
+ optional Appc appc = 2;
optional Docker docker = 3;
}
@@ -1349,7 +1357,10 @@ message Volume {
required Mode mode = 3;
- // Absolute path pointing to a directory or file in the container.
+ // Path pointing to a directory or file in the container. If the
+ // path is a relative path, it is relative to the container work
+ // directory. If the path is an absolute path, that path must
+ // already exist.
required string container_path = 1;
// The following specifies the source of this volume. At most one of
@@ -1394,9 +1405,10 @@ message NetworkInfo {
// Specifies either a request for an IP address, or the actual assigned
// IP address.
//
- // On a request (included in ContainerInfo) specifying neither `protocol`
- // nor `ip_address` means that the isolator is free to assign any available
- // address.
+ // Users can request an automatically assigned IP (for example, via an
+ // IPAM service) or a specific IP by adding a NetworkInfo to the
+ // ContainerInfo for a task. On a request, specifying neither `protocol`
+ // nor `ip_address` means that any available address may be assigned.
message IPAddress {
// Specify IP address requirement. Set protocol to the desired value to
// request the network isolator on the Agent to assign an IP address to the
@@ -1507,6 +1519,20 @@ message ContainerInfo {
// the type.
optional DockerInfo docker = 3;
optional MesosInfo mesos = 5;
+
+ // A list of network requests. A framework can request multiple IP addresses
+ // for the container.
+ repeated NetworkInfo network_infos = 7;
+}
+
+
+/**
+ * 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;
}