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/04/14 18:37:17 UTC
mesos git commit: Updated protobuf to support external storage.
Repository: mesos
Updated Branches:
refs/heads/master 6dc9f025a -> dba04cd8e
Updated protobuf to support external storage.
Review: https://reviews.apache.org/r/45214/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dba04cd8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dba04cd8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dba04cd8
Branch: refs/heads/master
Commit: dba04cd8ed9ed514b0782a1f27655728dd9ea478
Parents: 6dc9f02
Author: Guangya Liu <gy...@gmail.com>
Authored: Thu Apr 14 09:36:50 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Apr 14 09:36:50 2016 -0700
----------------------------------------------------------------------
include/mesos/mesos.proto | 37 +++++++++++++++++++++++++++++++++++++
include/mesos/v1/mesos.proto | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/dba04cd8/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 1232bcd..87af4a0 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -1581,6 +1581,7 @@ message Volume {
RO = 2; // read-only.
}
+ // TODO(gyliu513): Make this as `optional` after deprecation cycle of 0.29.
required Mode mode = 3;
// Path pointing to a directory or file in the container. If the
@@ -1599,6 +1600,42 @@ message Volume {
// The source of the volume is an Image which describes a root
// filesystem which will be provisioned by Mesos.
optional Image image = 4;
+
+ // Describes where a volume originates from.
+ message Source {
+ enum Type {
+ // This must be the first enum value in this list, to
+ // ensure that if 'type' is not set, the default value
+ // is UNKNOWN. This enables enum values to be added
+ // in a backwards-compatible way. See: MESOS-4997.
+ UNKNOWN = 0;
+
+ // TODO(gyliu513): Add HOST_PATH and IMAGE as volume source type.
+ DOCKER_VOLUME = 1;
+ }
+
+ message DockerVolume {
+ // Driver of the volume, it can be flocker, convoy, raxrey etc.
+ required string driver = 1;
+
+ // Name of the volume.
+ required string name = 2;
+
+ // Volume driver specific options.
+ optional Parameters driver_options = 3;
+ }
+
+ // Enum fields should be optional, see: MESOS-4997.
+ optional Type type = 1;
+
+ // The following specifies the source of this volume. At most one of
+ // the following should be set.
+
+ // The source of the volume created by docker volume driver.
+ optional DockerVolume docker_volume = 2;
+ }
+
+ optional Source source = 5;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/dba04cd8/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index 1048fae..34da0a1 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -1580,6 +1580,7 @@ message Volume {
RO = 2; // read-only.
}
+ // TODO(gyliu513): Make this as `optional` after deprecation cycle of 0.29.
required Mode mode = 3;
// Path pointing to a directory or file in the container. If the
@@ -1598,6 +1599,42 @@ message Volume {
// The source of the volume is an Image which describes a root
// filesystem which will be provisioned by Mesos.
optional Image image = 4;
+
+ // Describes where a volume originates from.
+ message Source {
+ enum Type {
+ // This must be the first enum value in this list, to
+ // ensure that if 'type' is not set, the default value
+ // is UNKNOWN. This enables enum values to be added
+ // in a backwards-compatible way. See: MESOS-4997.
+ UNKNOWN = 0;
+
+ // TODO(gyliu513): Add HOST_PATH and IMAGE as volume source type.
+ DOCKER_VOLUME = 1;
+ }
+
+ message DockerVolume {
+ // Driver of the volume, it can be flocker, convoy, raxrey etc.
+ required string driver = 1;
+
+ // Name of the volume.
+ required string name = 2;
+
+ // Volume driver specific options.
+ optional Parameters driver_options = 3;
+ }
+
+ // Enum fields should be optional, see: MESOS-4997.
+ optional Type type = 1;
+
+ // The following specifies the source of this volume. At most one of
+ // the following should be set.
+
+ // The source of the volume created by docker volume driver.
+ optional DockerVolume docker_volume = 2;
+ }
+
+ optional Source source = 5;
}