Repository: mesos Updated Branches: refs/heads/master eb4d4428f -> e6c8c620e
Synchronized v1/ and unversioned copies of `mesos.proto`. No functional changes, but various comments were slightly out of sync. Review: https://reviews.apache.org/r/43617/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e6c8c620 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e6c8c620 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e6c8c620 Branch: refs/heads/master Commit: e6c8c620e7eb0ade4d47b64e9db7f58d11a8c051 Parents: eb4d442 Author: Neil Conway <[email protected]> Authored: Tue Feb 16 15:04:56 2016 -0500 Committer: Joris Van Remoortere <[email protected]> Committed: Tue Feb 16 15:14:17 2016 -0500 ---------------------------------------------------------------------- include/mesos/mesos.proto | 19 +++++++++++-------- include/mesos/v1/mesos.proto | 18 +++++++++--------- src/v1/values.cpp | 1 + 3 files changed, 21 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/e6c8c620/include/mesos/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto index 0bd5aba..e24d3e0 100644 --- a/include/mesos/mesos.proto +++ b/include/mesos/mesos.proto @@ -414,13 +414,15 @@ message ExecutorInfo { repeated Resource resources = 5; optional string name = 9; - // Source is an identifier style string used by frameworks to track - // the source of an executor. This is useful when it's possible for - // different executor ids to be related semantically. - // NOTE: Source is exposed alongside the resource usage of the - // executor via JSON on the slave. This allows users to import - // usage information into a time series database for monitoring. + // 'source' is an identifier style string used by frameworks to + // track the source of an executor. This is useful when it's + // possible for different executor ids to be related semantically. + // + // NOTE: 'source' is exposed alongside the resource usage of the + // executor via JSON on the slave. This allows users to import usage + // information into a time series database for monitoring. optional string source = 10; + optional bytes data = 4; // Service discovery information for the executor. It is not @@ -594,7 +596,7 @@ message Resource { // associate arbitrary metadata with a reserved resource. For // example, frameworks can use labels to identify the intended // purpose for a portion of the resources the framework has - // reserved at a given agent. + // reserved at a given slave. optional Labels labels = 2; } @@ -1411,7 +1413,7 @@ message Volume { * Describes a network request from a framework as well as network resolution * provided by Mesos. * - * A Framework may request the network isolator on the Agent to isolate the + * A framework may request the network isolator on the Agent to isolate the * container in a network namespace and create a virtual network interface. * The `NetworkInfo` message describes the properties of that virtual * interface, including the IP addresses and network isolation policy @@ -1578,6 +1580,7 @@ message ContainerStatus { * 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 http://git-wip-us.apache.org/repos/asf/mesos/blob/e6c8c620/include/mesos/v1/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto index 38e04cb..d909e60 100644 --- a/include/mesos/v1/mesos.proto +++ b/include/mesos/v1/mesos.proto @@ -185,7 +185,7 @@ message MachineInfo { DRAINING = 2; // In this mode, a machine is not running any tasks and will not offer - // any of its resources. agents on the machine will not be allowed to + // any of its resources. Agents on the machine will not be allowed to // register with the master. DOWN = 3; } @@ -1048,7 +1048,7 @@ message InverseOffer { // For reserved resources, the resources are expected to be returned to the // framework after the unavailability interval. This is an expectation, // not a guarantee. For example, if the unavailability duration is not set, - // the resources may be removed permenantly. + // the resources may be removed permanently. // // For other resources, there is no guarantee that requested resources will // be returned after the unavailability interval. The allocator has no @@ -1407,8 +1407,8 @@ message Volume { /** - * Describes a network request by framework as well as network resolution - * provided by the executor or Agent. + * Describes a network request from a framework as well as network resolution + * provided by Mesos. * * A framework may request the network isolator on the Agent to isolate the * container in a network namespace and create a virtual network interface. @@ -1417,10 +1417,10 @@ message Volume { * (network group membership). * * The NetworkInfo message is not interpreted by the Master or Agent and is - * intended to be used by Agent modules implementing network isolation. If the - * modules are missing, the message is simply ignored. In future, the task - * launch will fail if there is no module providing the network isolation - * capabilities (MESOS-3390). + * intended to be used by Agent and Master modules implementing network + * isolation. If the modules are missing, the message is simply ignored. In + * future, the task launch will fail if there is no module providing the + * network isolation capabilities (MESOS-3390). * * An executor, Agent, or an Agent module may append NetworkInfos inside * TaskStatus::container_status to provide information such as the container IP @@ -1432,7 +1432,7 @@ message NetworkInfo { IPv6 = 2; } - // Specifies either a request for an IP address, or the actual assigned + // Specifies a request for an IP address, or reports the assigned container // IP address. // // Users can request an automatically assigned IP (for example, via an http://git-wip-us.apache.org/repos/asf/mesos/blob/e6c8c620/src/v1/values.cpp ---------------------------------------------------------------------- diff --git a/src/v1/values.cpp b/src/v1/values.cpp index 86094b3..58ea987 100644 --- a/src/v1/values.cpp +++ b/src/v1/values.cpp @@ -90,6 +90,7 @@ Value::Scalar& operator-=(Value::Scalar& left, const Value::Scalar& right) return left; } + namespace internal { struct Range
