HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D1036

Update Mesos to v1.4.0-rc3 and recompile updated protobuf files
ClosedAll Users
Actions

Authored by ichernetsky on Sep 2 2017, 8:41 AM.

Details

Reviewers
kensipe
timcharper
zen-dog
jeschkies
jenkins
Commits
rMARATHONc6d3de54089b: Update Mesos to v1.4.0-rc3 and recompile updated protobuf files
JIRA Issues
JIRA MARATHON-7738 Update Mesos and protobuf files to 1.4.0-rc3
Summary

Also, get rid of the MarathonTask left-over. It was deleted from marathon.proto, but marathon.proto was not recompiled. And Java MarathonTask class was used in a couple of places in unit-tests.

Test Plan

sbt test integration:test

Diff Detail

Repository
rMARATHON marathon
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
ichernetsky created this revision.Sep 2 2017, 8:41 AM
jenkins requested changes to this revision.Sep 2 2017, 8:41 AM
This revision now requires changes to proceed.Sep 2 2017, 8:41 AM
jenkins accepted this revision.Sep 2 2017, 8:56 AM
This revision is now accepted and ready to land.Sep 2 2017, 8:56 AM
jenkins added a comment.Sep 2 2017, 8:56 AM
✔ Build of 4195 completed jenkins-public-marathon-phabricator-943.

You can create a DC/OS with your patched Marathon by creating a new pull
request with the following changes in buildinfo.json:

＼\ ٩( ᐛ )و /／

timcharper accepted this revision.Sep 5 2017, 6:13 PM
kensipe accepted this revision.Sep 5 2017, 7:41 PM
Closed by commit rMARATHONc6d3de54089b: Update Mesos to v1.4.0-rc3 and recompile updated protobuf files (authored by ichernetsky). · Explain WhySep 5 2017, 7:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 4207

View Options

project/Dependencies.scala

Show First 20 Lines • Show All 77 Lines • ▼ Show 20 Line(s)
7878
7979object Dependency {
8080 object V {
8181 // runtime deps versions
8282 val Aws = "1.11.129"
8383 val Alpakka = "0.8"
8484 val Chaos = "0.8.8"
8585 val Guava = "19.0"
86 val Mesos = "1.3.0-rc3"
86 val Mesos = "1.4.0-rc3"
8787 // Version of Mesos to use in Dockerfile.
8888 val MesosDebian = "1.2.0-2.0.6"
8989 val OpenJDK = "openjdk:8u121-jdk"
9090 val Akka = "2.4.18"
9191 val AkkaHttp = "10.0.6"
9292 val AkkaSSE = "2.0.0"
9393 val ApacheCommonsCompress = "1.13"
9494 val ApacheCommonsIO = "2.4"
▲ Show 20 Lines • Show All 101 Lines • Show Last 20 Lines
View Options

src/main/java/mesosphere/marathon/Protos.java

This file has a very large number of changes (19,925 lines). Show File Contents
View Options

src/main/proto/README.md

11# Google Protocol Buffers
22
33Marathon is using Google [Protocol Buffers](https://developers.google.com/protocol-buffers) to marshal and unmarshal data from the persistent store.
44
55## Dependencies
66
7- Google [Protocol Buffers](https://developers.google.com/protocol-buffers) v2.6.1 should be installed on the system.
7- Google [Protocol Buffers](https://developers.google.com/protocol-buffers) v3.3.0 should be installed on the system.
88- The `src/main/proto/mesos/mesos.proto` should correspond to the [Mesos](http://mesos.apache.org) library
99 version.
1010
1111## Rebuilt the protos
1212
1313To rebuild the protos, open a terminal where the current working directory is the project directory.
1414
1515```
1616$> cd src/main/proto
1717$> protoc --java_out=../java/ marathon.proto
1818```
View Options

src/main/proto/marathon.proto

11//
22// protoc --java_out=src/main/java/ --proto_path=/path/to/mesos/include/mesos/ --proto_path=src/main/proto/ src/main/proto/marathon.proto
33//
4syntax = "proto2";
5
46package mesosphere.marathon;
57
68option java_package = "mesosphere.marathon";
79option java_outer_classname = "Protos";
810
911import "mesos/mesos.proto";
1012
1113message Constraint {
▲ Show 20 Lines • Show All 421 Lines • Show Last 20 Lines
View Options

src/main/proto/mesos/mesos.proto

Show First 20 Lines • Show All 59 Lines • ▼ Show 20 Line(s)
6060 required string value = 1;
6161}
6262
6363
6464/**
6565 * A framework-generated ID to distinguish a task. The ID must remain
6666 * unique while the task is active. A framework can reuse an ID _only_
6767 * if the previous task with the same ID has reached a terminal state
68 * (e.g., TASK_FINISHED, TASK_LOST, TASK_KILLED, etc.). However,
69 * reusing task IDs is strongly discouraged (MESOS-2198).
68 * (e.g., TASK_FINISHED, TASK_KILLED, etc.). However, reusing task IDs
69 * is strongly discouraged (MESOS-2198).
7070 */
7171message TaskID {
7272 required string value = 1;
7373}
7474
7575
7676/**
7777 * A framework-generated ID to distinguish an executor. Only one
▲ Show 20 Lines • Show All 259 Lines • ▼ Show 20 Line(s)
337337
338338 // This expresses the ability for the framework to be
339339 // "multi-tenant" via using the newly introduced `roles`
340340 // field, and examining `Offer.allocation_info` to determine
341341 // which role the offers are being made to. We also
342342 // expect that "single-tenant" schedulers eventually
343343 // provide this and move away from the deprecated
344344 // `role` field.
345 MULTI_ROLE = 6;
346
347 // This capability has two effects for a framework.
345348 //
346 // NOTE: The implementation for supporting multiple
347 // roles is not complete, DO NOT USE THIS.
348 MULTI_ROLE = 6; // EXPERIMENTAL.
349 // (1) The framework is offered resources in a new format.
350 //
351 // The offered resources have the `Resource.reservations` field set
352 // rather than `Resource.role` and `Resource.reservation`. In short,
353 // an empty `reservations` field denotes unreserved resources, and
354 // each `ReservationInfo` in the `reservations` field denotes a
355 // reservation that refines the previous one.
356 //
357 // See the 'Resource Format' section for more details.
358 //
359 // (2) The framework can create refined reservations.
360 //
361 // A framework can refine an existing reservation via the
362 // `Resource.reservations` field. For example, a reservation for role
363 // `eng` can be refined to `eng/front_end`.
364 //
365 // See `ReservationInfo.reservations` for more details.
366 //
367 // NOTE: Without this capability, a framework is not offered resources
368 // that have refined reservations. A resource is said to have refined
369 // reservations if it uses the `Resource.reservations` field, and
370 // `Resource.reservations_size() > 1`.
371 RESERVATION_REFINEMENT = 7; // EXPERIMENTAL.
372
373 // Indicates that the framework is prepared to receive offers
374 // for agents whose region is different from the master's
375 // region. Network links between hosts in different regions
376 // typically have higher latency and lower bandwidth than
377 // network links within a region, so frameworks should be
378 // careful to only place suitable workloads in remote regions.
379 // Frameworks that are not region-aware will never receive
380 // offers for remote agents; region-aware frameworks are assumed
381 // to implement their own logic to decide which workloads (if
382 // any) are suitable for placement on remote agents.
383 REGION_AWARE = 8;
349384 }
350385
351386 // Enum fields should be optional, see: MESOS-4997.
352387 optional Type type = 1;
353388 }
354389
355390 // This field allows a framework to advertise its set of
356391 // capabilities (e.g., ability to receive offers for revocable
▲ Show 20 Lines • Show All 169 Lines • ▼ Show 20 Line(s)
526561 // timeout, the health check is aborted and treated as a failure. Zero
527562 // means infinite timeout.
528563 optional double timeout_seconds = 4 [default = 20.0];
529564
530565 // Number of consecutive failures until the task is killed by the executor.
531566 optional uint32 consecutive_failures = 5 [default = 3];
532567
533568 // Amount of time after the task is launched during which health check
534 // failures are ignored. Once the a check succeeds for the first time,
569 // failures are ignored. Once a check succeeds for the first time,
535570 // the grace period does not apply anymore. Note that it includes
536571 // `delay_seconds`, i.e., setting `grace_period_seconds` < `delay_seconds`
537572 // has no effect.
538573 optional double grace_period_seconds = 6 [default = 10.0];
539574
540575 // TODO(alexr): Add an optional `KillPolicy` that should be used
541576 // if the task is killed because of a health check failure.
542577
▲ Show 20 Lines • Show All 193 Lines • ▼ Show 20 Line(s)
736771 // will be kept in memory on master and slave processes. Therefore,
737772 // labels should be used to tag executors with lightweight metadata.
738773 // Labels should not contain duplicate key-value pairs.
739774 optional Labels labels = 14;
740775}
741776
742777
743778/**
779 * Describes a domain. A domain is a collection of hosts that have
780 * similar characteristics. Mesos currently only supports "fault
781 * domains", which identify groups of hosts with similar failure
782 * characteristics.
783 *
784 * Frameworks can generally assume that network links between hosts in
785 * the same fault domain have lower latency, higher bandwidth, and better
786 * availability than network links between hosts in different domains.
787 * Schedulers may prefer to place network-intensive workloads in the
788 * same domain, as this may improve performance. Conversely, a single
789 * failure that affects a host in a domain may be more likely to
790 * affect other hosts in the same domain; hence, schedulers may prefer
791 * to place workloads that require high availability in multiple
792 * domains. (For example, all the hosts in a single rack might lose
793 * power or network connectivity simultaneously.)
794 *
795 * There are two kinds of fault domains: regions and zones. Regions
796 * offer the highest degree of fault isolation, but network latency
797 * between regions is typically high (typically >50 ms). Zones offer a
798 * modest degree of fault isolation along with reasonably low network
799 * latency (typically <10 ms).
800 *
801 * The mapping from fault domains to physical infrastructure is up to
802 * the operator to configure. In cloud environments, regions and zones
803 * can be mapped to the "region" and "availability zone" concepts
804 * exposed by most cloud providers, respectively. In on-premise
805 * deployments, regions and zones can be mapped to data centers and
806 * racks, respectively.
807 *
808 * Both masters and agents can be configured with domains. Frameworks
809 * can compare the domains of two hosts to determine if the hosts are
810 * in the same zone, in different zones in the same region, or in
811 * different regions. Note that all masters in a given Mesos cluster
812 * must be in the same region.
813 */
814message DomainInfo {
815 message FaultDomain {
816 message RegionInfo {
817 required string name = 1;
818 }
819
820 message ZoneInfo {
821 required string name = 1;
822 }
823
824 required RegionInfo region = 1;
825 required ZoneInfo zone = 2;
826 }
827
828 optional FaultDomain fault_domain = 1;
829}
830
831
832/**
744833 * Describes a master. This will probably have more fields in the
745834 * future which might be used, for example, to link a framework webui
746835 * to a master webui.
747836 */
748837message MasterInfo {
749838 required string id = 1;
750839
751840 // The IP address (only IPv4) as a packed 4-bytes integer,
Show All 19 Lines
771860 // The running Master version, as a string; taken from the
772861 // generated "master/version.hpp".
773862 optional string version = 6;
774863
775864 // The full IP address (supports both IPv4 and IPv6 formats)
776865 // and supersedes the use of `ip`, `port` and `hostname`.
777866 // Since Mesos 0.24.
778867 optional Address address = 7;
868
869 // The domain that this master belongs to. All masters in a Mesos
870 // cluster should belong to the same region.
871 optional DomainInfo domain = 8;
779872}
780873
781874
782875/**
783876 * Describes a slave. Note that the 'id' field is only available after
784877 * a slave is registered with the master, and is made available here
785878 * to facilitate re-registration.
786879 */
787880message SlaveInfo {
788881 required string hostname = 1;
789882 optional int32 port = 8 [default = 5051];
883
884 // The configured resources at the agent. This does not include any
885 // dynamic reservations or persistent volumes that may currently
886 // exist at the agent.
790887 repeated Resource resources = 3;
888
791889 repeated Attribute attributes = 5;
792890 optional SlaveID id = 6;
793891
892 // The domain that this slave belongs to. If the slave's region
893 // differs from the master's region, it will not appear in resource
894 // offers to frameworks that have not enabled the REGION_AWARE
895 // capability.
896 optional DomainInfo domain = 10;
897
794898 // Slave checkpointing is always enabled in recent Mesos versions;
795899 // the value of this field is ignored.
796900 // TODO(joerg84): Remove checkpoint field after deprecation cycle starting
797901 // with 0.27 (MESOS-2317).
798902 optional bool checkpoint = 7 [default = false];
799903
800904 message Capability {
801905 enum Type {
802906 // This must be the first enum value in this list, to
803907 // ensure that if 'type' is not set, the default value
804908 // is UNKNOWN. This enables enum values to be added
805909 // in a backwards-compatible way. See: MESOS-4997.
806910 UNKNOWN = 0;
807911
808912 // This expresses the ability for the agent to be able
809913 // to launch tasks of a 'multi-role' framework.
914 MULTI_ROLE = 1;
915
916 // This expresses the ability for the agent to be able to launch
917 // tasks, reserve resources, and create volumes using resources
918 // allocated to a 'hierarchical-role'.
919 // NOTE: This capability is required specifically for creating
920 // volumes because a hierchical role includes '/' (slashes) in them.
921 // Agents with this capability know to transform the '/' (slashes)
922 // into ' ' (spaces).
923 HIERARCHICAL_ROLE = 2;
924
925 // This capability has three effects for an agent.
810926 //
811 // NOTE: The implementation for supporting multiple
812 // roles is not complete, DO NOT USE THIS.
813 MULTI_ROLE = 1; // EXPERIMENTAL.
927 // (1) The format of the checkpointed resources, and
928 // the resources reported to master.
929 //
930 // These resources are reported in the "pre-reservation-refinement"
931 // format if none of the resources have refined reservations. If any
932 // of the resources have refined reservations, they are reported in
933 // the "post-reservation-refinement" format. The purpose is to allow
934 // downgrading of an agent as well as communication with a pre-1.4.0
935 // master until the reservation refinement feature is actually used.
936 //
937 // See the 'Resource Format' section for more details.
938 //
939 // (2) The format of the resources reported by the HTTP endpoints.
940 //
941 // For resources reported by agent endpoints, the
942 // "pre-reservation-refinement" format is "injected" if possible.
943 // That is, resources without refined reservations will have the
944 // `Resource.role` and `Resource.reservation` set, whereas
945 // resources with refined reservations will not.
946 //
947 // See the 'Resource Format' section for more details.
948 //
949 // (3) The ability for the agent to launch tasks, reserve resources, and
950 // create volumes using resources that have refined reservations.
951 //
952 // See `ReservationInfo.reservations` section for more details.
953 //
954 // NOTE: Resources are said to have refined reservations if it uses the
955 // `Resource.reservations` field, and `Resource.reservations_size() > 1`.
956 RESERVATION_REFINEMENT = 3;
814957 }
815958
816959 // Enum fields should be optional, see: MESOS-4997.
817960 optional Type type = 1;
818961 }
819962}
820963
821964
822965/**
823966 * Describes a resource provider. Note that the 'id' field is only available
824967 * after a resource provider is registered with the master, and is made
825968 * available here to facilitate re-registration.
826969 */
827970message ResourceProviderInfo {
828971 optional ResourceProviderID id = 1;
829972 repeated Attribute attributes = 2;
830 repeated Resource resources = 3;
973
974 // The type of the resource provider. This uniquely identifies a
975 // resource provider implementation. For instance:
976 // org.apache.mesos.rp.local.storage
977 //
978 // Please follow to Java package naming convention
979 // (https://en.wikipedia.org/wiki/Java_package#Package_naming_conventions)
980 // to avoid conflicts on type names.
981 required string type = 3;
982
983 // The name of the resource provider. There could be multiple
984 // instances of a type of resource provider. The name field is used
985 // to distinguish these instances.
986 required string name = 4;
831987}
832988
833989
834990/**
835991 * Describes an Attribute or Resource "value". A value is described
836992 * using the standard protocol buffer "union" trick.
837993 */
838994message Value {
▲ Show 20 Lines • Show All 76 Lines • ▼ Show 20 Line(s)
9151071 required Value.Type type = 2;
9161072 optional Value.Scalar scalar = 3;
9171073 optional Value.Ranges ranges = 4;
9181074 optional Value.Set set = 5;
9191075
9201076 // The role that this resource is reserved for. If "*", this indicates
9211077 // that the resource is unreserved. Otherwise, the resource will only
9221078 // be offered to frameworks that belong to this role.
923 optional string role = 6 [default = "*"];
1079 //
1080 // NOTE: Frameworks must not set this field if `reservations` is set.
1081 // See the 'Resource Format' section for more details.
1082 //
1083 // TODO(mpark): Deprecate once `reservations` is no longer experimental.
1084 optional string role = 6 [default = "*", deprecated=true];
9241085
9251086 // This was initially introduced to support MULTI_ROLE capable
9261087 // frameworks. Frameworks that are not MULTI_ROLE capable can
9271088 // continue to assume that the offered resources are allocated
9281089 // to their role.
929 //
930 // NOTE: Implementation of this is in-progress, DO NOT USE!
9311090 message AllocationInfo {
9321091 // If set, this resource is allocated to a role. Note that in the
9331092 // future, this may be unset and the scheduler may be responsible
9341093 // for allocating to one of its roles.
9351094 optional string role = 1;
9361095
9371096 // In the future, we may add additional fields here, e.g. priority
9381097 // tier, type of allocation (quota / fair share).
9391098 }
9401099
9411100 optional AllocationInfo allocation_info = 11;
9421101
1102 // Resource Format:
1103 //
1104 // Frameworks receive resource offers in one of two formats, depending on
1105 // whether the RESERVATION_REFINEMENT capability is enabled.
1106 //
1107 // __WITHOUT__ the RESERVATION_REFINEMENT capability, the framework is offered
1108 // resources in the "pre-reservation-refinement" format. In this format, the
1109 // `Resource.role` and `Resource.reservation` fields are used in conjunction
1110 // to describe the reservation state of a `Resource` message.
1111 //
1112 // The following is an overview of the possible reservation states:
1113 //
1114 // +------------+------------------------------------------------------------+
1115 // | unreserved | { |
1116 // | | role: "*", |
1117 // | | reservation: <not set>, |
1118 // | | reservations: <unused> |
1119 // | | } |
1120 // +------------+------------------------------------------------------------+
1121 // | static | { |
1122 // | | role: "eng", |
1123 // | | reservation: <not set>, |
1124 // | | reservations: <unused> |
1125 // | | } |
1126 // +------------+------------------------------------------------------------+
1127 // | dynamic | { |
1128 // | | role: "eng", |
1129 // | | reservation: { |
1130 // | | type: <unused>, |
1131 // | | role: <unused>, |
1132 // | | principal: <optional>, |
1133 // | | labels: <optional> |
1134 // | | }, |
1135 // | | reservations: <unused> |
1136 // | | } |
1137 // +------------+------------------------------------------------------------+
1138 //
1139 // __WITH__ the RESERVATION_REFINEMENT capability, the framework is offered
1140 // resources in the "post-reservation-refinement" format. In this format, the
1141 // reservation state of a `Resource` message is expressed solely in
1142 // `Resource.reservations` field.
1143 //
1144 // The following is an overview of the possible reservation states:
1145 //
1146 // +------------+------------------------------------------------------------+
1147 // | unreserved | { |
1148 // | | role: <unused>, |
1149 // | | reservation: <unused>, |
1150 // | | reservations: [] |
1151 // | | } |
1152 // +------------+------------------------------------------------------------+
1153 // | static | { |
1154 // | | role: <unused>, |
1155 // | | reservation: <unused>, |
1156 // | | reservations: [ |
1157 // | | { |
1158 // | | type: STATIC, |
1159 // | | role: "eng", |
1160 // | | principal: <optional>, |
1161 // | | labels: <optional> |
1162 // | | } |
1163 // | | ] |
1164 // | | } |
1165 // +------------+------------------------------------------------------------+
1166 // | dynamic | { |
1167 // | | role: <unused>, |
1168 // | | reservation: <unused>, |
1169 // | | reservations: [ |
1170 // | | { |
1171 // | | type: DYNAMIC, |
1172 // | | role: "eng", |
1173 // | | principal: <optional>, |
1174 // | | labels: <optional> |
1175 // | | } |
1176 // | | ] |
1177 // | | } |
1178 // +------------+------------------------------------------------------------+
1179 //
1180 // We can also __refine__ reservations with this capability like so:
1181 //
1182 // +------------+------------------------------------------------------------+
1183 // | refined | { |
1184 // | | role: <unused>, |
1185 // | | reservation: <unused>, |
1186 // | | reservations: [ |
1187 // | | { |
1188 // | | type: STATIC or DYNAMIC, |
1189 // | | role: "eng", |
1190 // | | principal: <optional>, |
1191 // | | labels: <optional> |
1192 // | | }, |
1193 // | | { |
1194 // | | type: DYNAMIC, |
1195 // | | role: "eng/front_end", |
1196 // | | principal: <optional>, |
1197 // | | labels: <optional> |
1198 // | | } |
1199 // | | ] |
1200 // | | } |
1201 // +------------+------------------------------------------------------------+
1202 //
1203 // NOTE: Each `ReservationInfo` in the `reservations` field denotes
1204 // a reservation that refines the previous `ReservationInfo`.
1205
9431206 message ReservationInfo {
944 // Describes a dynamic reservation. A dynamic reservation is
945 // acquired by an operator via the '/reserve' HTTP endpoint or by
946 // a framework via the offer cycle by sending back an
1207 // Describes a reservation. A static reservation is set by the operator on
1208 // the command-line and they are immutable without agent restart. A dynamic
1209 // reservation is made by an operator via the '/reserve' HTTP endpoint
1210 // or by a framework via the offer cycle by sending back an
9471211 // 'Offer::Operation::Reserve' message.
948 // NOTE: We currently do not allow frameworks with role "*" to
949 // make dynamic reservations.
1212 //
1213 // NOTE: We currently do not allow frameworks with role "*" to make dynamic
1214 // reservations.
9501215
1216 enum Type {
1217 UNKNOWN = 0;
1218 STATIC = 1;
1219 DYNAMIC = 2;
1220 }
1221
1222 // The type of this reservation.
1223 //
1224 // NOTE: This field must not be set for `Resource.reservation`.
1225 // See the 'Resource Format' section for more details.
1226 optional Type type = 4;
1227
1228 // The role to which this reservation is made for.
1229 //
1230 // NOTE: This field must not be set for `Resource.reservation`.
1231 // See the 'Resource Format' section for more details.
1232 optional string role = 3;
1233
9511234 // Indicates the principal, if any, of the framework or operator
9521235 // that reserved this resource. If reserved by a framework, the
9531236 // field should match the `FrameworkInfo.principal`. It is used in
9541237 // conjunction with the `UnreserveResources` ACL to determine
9551238 // whether the entity attempting to unreserve this resource is
9561239 // permitted to do so.
9571240 optional string principal = 1;
9581241
9591242 // Labels are free-form key value pairs that can be used to
9601243 // associate arbitrary metadata with a reserved resource. For
9611244 // example, frameworks can use labels to identify the intended
9621245 // purpose for a portion of the resources the framework has
9631246 // reserved at a given slave. Labels should not contain duplicate
9641247 // key-value pairs.
9651248 optional Labels labels = 2;
9661249 }
9671250
9681251 // If this is set, this resource was dynamically reserved by an
9691252 // operator or a framework. Otherwise, this resource is either unreserved
9701253 // or statically reserved by an operator via the --resources flag.
1254 //
1255 // NOTE: Frameworks must not set this field if `reservations` is set.
1256 // See the 'Resource Format' section for more details.
1257 //
1258 // TODO(mpark): Deprecate once `reservations` is no longer experimental.
9711259 optional ReservationInfo reservation = 8;
9721260
1261 // The stack of reservations. If this field is empty, it indicates that this
1262 // resource is unreserved. Otherwise, the resource is reserved. The first
1263 // `ReservationInfo` may have type `STATIC` or `DYNAMIC`, but the rest must
1264 // have `DYNAMIC`. One can create a new reservation on top of an existing
1265 // one by pushing a new `ReservationInfo` to the back. The last
1266 // `ReservationInfo` in this stack is the "current" reservation. The new
1267 // reservation's role must be a child of the current reservation's role.
1268 //
1269 // NOTE: Frameworks must not set this field if `reservation` is set.
1270 // See the 'Resource Format' section for more details.
1271 //
1272 // TODO(mpark): Deprecate `role` and `reservation` once this is stable.
1273 repeated ReservationInfo reservations = 13; // EXPERIMENTAL.
1274
9731275 message DiskInfo {
9741276 // Describes a persistent disk volume.
9751277 //
9761278 // A persistent disk volume will not be automatically garbage
9771279 // collected if the task/executor/slave terminates, but will be
9781280 // re-offered to the framework(s) belonging to the 'role'.
9791281 //
9801282 // NOTE: Currently, we do not allow persistent disk volumes
▲ Show 20 Lines • Show All 119 Lines • ▼ Show 20 Line(s)
11001402 optional uint64 qlen = 7;
11011403 optional uint64 ratebps = 8;
11021404 optional uint64 ratepps = 9;
11031405 optional uint64 requeues = 10;
11041406}
11051407
11061408
11071409message IpStatistics {
1108 optional int64 Forwarding = 1;
1109 optional int64 DefaultTTL = 2;
1110 optional int64 InReceives = 3;
1111 optional int64 InHdrErrors = 4;
1112 optional int64 InAddrErrors = 5;
1113 optional int64 ForwDatagrams = 6;
1410 optional int64 Forwarding = 1;
1411 optional int64 DefaultTTL = 2;
1412 optional int64 InReceives = 3;
1413 optional int64 InHdrErrors = 4;
1414 optional int64 InAddrErrors = 5;
1415 optional int64 ForwDatagrams = 6;
11141416 optional int64 InUnknownProtos = 7;
1115 optional int64 InDiscards = 8;
1116 optional int64 InDelivers = 9;
1417 optional int64 InDiscards = 8;
1418 optional int64 InDelivers = 9;
11171419 optional int64 OutRequests = 10;
11181420 optional int64 OutDiscards = 11;
11191421 optional int64 OutNoRoutes = 12;
11201422 optional int64 ReasmTimeout = 13;
11211423 optional int64 ReasmReqds = 14;
11221424 optional int64 ReasmOKs = 15;
11231425 optional int64 ReasmFails = 16;
11241426 optional int64 FragOKs = 17;
11251427 optional int64 FragFails = 18;
11261428 optional int64 FragCreates = 19;
11271429}
11281430
11291431
11301432message IcmpStatistics {
11311433 optional int64 InMsgs = 1;
1132 optional int64 InErrors = 2;
1434 optional int64 InErrors = 2;
11331435 optional int64 InCsumErrors = 3;
1134 optional int64 InDestUnreachs = 4;
1436 optional int64 InDestUnreachs = 4;
11351437 optional int64 InTimeExcds = 5;
1136 optional int64 InParmProbs = 6;
1438 optional int64 InParmProbs = 6;
11371439 optional int64 InSrcQuenchs = 7;
11381440 optional int64 InRedirects = 8;
11391441 optional int64 InEchos = 9;
11401442 optional int64 InEchoReps = 10;
11411443 optional int64 InTimestamps = 11;
11421444 optional int64 InTimestampReps = 12;
11431445 optional int64 InAddrMasks = 13;
11441446 optional int64 InAddrMaskReps = 14;
▲ Show 20 Lines • Show All 132 Lines • ▼ Show 20 Line(s)
12771579
12781580 // Disk Usage Information for executor working directory.
12791581 optional uint64 disk_limit_bytes = 26;
12801582 optional uint64 disk_used_bytes = 27;
12811583
12821584 // Per disk (resource) statistics.
12831585 repeated DiskStatistics disk_statistics = 43;
12841586
1587 // Cgroups blkio statistics.
1588 optional CgroupInfo.Blkio.Statistics blkio_statistics = 44;
1589
12851590 // Perf statistics.
12861591 optional PerfStatistics perf = 13;
12871592
12881593 // Network Usage Information:
12891594 optional uint64 net_rx_packets = 14;
12901595 optional uint64 net_rx_bytes = 15;
12911596 optional uint64 net_rx_errors = 16;
12921597 optional uint64 net_rx_dropped = 17;
▲ Show 20 Lines • Show All 154 Lines • ▼ Show 20 Line(s)
14471752 required OfferID id = 1;
14481753 required FrameworkID framework_id = 2;
14491754 required SlaveID slave_id = 3;
14501755 required string hostname = 4;
14511756
14521757 // URL for reaching the slave running on the host.
14531758 optional URL url = 8;
14541759
1760 // The domain of the slave.
1761 optional DomainInfo domain = 11;
1762
14551763 repeated Resource resources = 5;
14561764 repeated Attribute attributes = 7;
14571765 repeated ExecutorID executor_ids = 6;
14581766
14591767 // Signifies that the resources in this Offer may be unavailable during
14601768 // the given interval. Any tasks launched using these resources may be
14611769 // killed when the interval arrives. For example, these resources may be
14621770 // part of a planned maintenance schedule.
14631771 //
14641772 // This field only provides information about a planned unavailability.
14651773 // The unavailability interval may not necessarily start at exactly this
14661774 // interval, nor last for exactly the duration of this interval.
14671775 // The unavailability may also be forever! See comments in
14681776 // `Unavailability` for more details.
14691777 optional Unavailability unavailability = 9;
14701778
14711779 // An offer represents resources allocated to *one* of the
14721780 // roles managed by the scheduler. (Therefore, each
14731781 // `Offer.resources[i].allocation_info` will match the
14741782 // top level `Offer.allocation_info`).
1475 //
1476 // NOTE: Implementation of this is in-progress, DO NOT USE!
14771783 optional Resource.AllocationInfo allocation_info = 10;
14781784
14791785 // Defines an operation that can be performed against offers.
14801786 message Operation {
14811787 enum Type {
14821788 UNKNOWN = 0;
14831789 LAUNCH = 1;
14841790 LAUNCH_GROUP = 6;
▲ Show 20 Lines • Show All 239 Lines • ▼ Show 20 Line(s)
17242030
17252031 TASK_FINISHED = 2; // TERMINAL: The task finished successfully.
17262032 TASK_FAILED = 3; // TERMINAL: The task failed to finish successfully.
17272033 TASK_KILLED = 4; // TERMINAL: The task was killed by the executor.
17282034 TASK_ERROR = 7; // TERMINAL: The task description contains an error.
17292035
17302036 // In Mesos 1.3, this will only be sent when the framework does NOT
17312037 // opt-in to the PARTITION_AWARE capability.
1732 TASK_LOST = 5; // TERMINAL: The task failed but can be rescheduled.
2038 //
2039 // NOTE: This state is not always terminal. For example, tasks might
2040 // transition from TASK_LOST to TASK_RUNNING or other states when a
2041 // partitioned agent re-registers.
2042 TASK_LOST = 5; // The task failed but can be rescheduled.
17332043
1734 // The following task statuses are only sent when the framework
2044 // The following task states are only sent when the framework
17352045 // opts-in to the PARTITION_AWARE capability.
17362046
17372047 // The task failed to launch because of a transient error. The
17382048 // task's executor never started running. Unlike TASK_ERROR, the
17392049 // task description is valid -- attempting to launch the task again
17402050 // may be successful.
17412051 TASK_DROPPED = 9; // TERMINAL.
17422052
▲ Show 20 Lines • Show All 105 Lines • ▼ Show 20 Line(s)
18482158 REASON_CONTAINER_LIMITATION = 19;
18492159 REASON_CONTAINER_LIMITATION_DISK = 20;
18502160 REASON_CONTAINER_LIMITATION_MEMORY = 8;
18512161 REASON_CONTAINER_PREEMPTED = 17;
18522162 REASON_CONTAINER_UPDATE_FAILED = 22;
18532163 REASON_EXECUTOR_REGISTRATION_TIMEOUT = 23;
18542164 REASON_EXECUTOR_REREGISTRATION_TIMEOUT = 24;
18552165 REASON_EXECUTOR_TERMINATED = 1;
1856 REASON_EXECUTOR_UNREGISTERED = 2;
2166 REASON_EXECUTOR_UNREGISTERED = 2; // No longer used.
18572167 REASON_FRAMEWORK_REMOVED = 3;
18582168 REASON_GC_ERROR = 4;
18592169 REASON_INVALID_FRAMEWORKID = 5;
18602170 REASON_INVALID_OFFERS = 6;
18612171 REASON_IO_SWITCHBOARD_EXITED = 27;
18622172 REASON_MASTER_DISCONNECTED = 7;
18632173 REASON_RECONCILIATION = 9;
18642174 REASON_RESOURCES_UNKNOWN = 18;
18652175 REASON_SLAVE_DISCONNECTED = 10;
18662176 REASON_SLAVE_REMOVED = 11;
18672177 REASON_SLAVE_RESTARTED = 12;
18682178 REASON_SLAVE_UNKNOWN = 13;
2179 REASON_TASK_KILLED_DURING_LAUNCH = 30;
18692180 REASON_TASK_CHECK_STATUS_UPDATED = 28;
2181 REASON_TASK_HEALTH_CHECK_STATUS_UPDATED = 29;
18702182 REASON_TASK_GROUP_INVALID = 25;
18712183 REASON_TASK_GROUP_UNAUTHORIZED = 26;
18722184 REASON_TASK_INVALID = 14;
18732185 REASON_TASK_UNAUTHORIZED = 15;
18742186 REASON_TASK_UNKNOWN = 16;
18752187 }
18762188
18772189 required TaskID task_id = 1;
▲ Show 20 Lines • Show All 266 Lines • ▼ Show 20 Line(s)
21442456 //
21452457 // See: https://docs.docker.com/reference/commandline/pull/
21462458 required string name = 1;
21472459
21482460 // Credential to authenticate with docker registry.
21492461 // NOTE: This is not encrypted, therefore framework and operators
21502462 // should enable SSL when passing this information.
21512463 //
2152 // This is field is never used in Mesos before and is deprecated
2153 // since Mesos 1.3. Please use the `Secret::Value` field `config`
2154 // below (see MESOS-7088 for details).
2464 // This field has never been used in Mesos before and is
2465 // deprecated since Mesos 1.3. Please use `config` below
2466 // (see MESOS-7088 for details).
21552467 optional Credential credential = 2 [deprecated = true]; // Since 1.3.
21562468
2157 // The UTF-8 character encoded byte data, which is expected as
2158 // a docker config file in JSON format. This field is used for
2159 // supporting docker private registry credential per container.
2160 // Users can specify different docker config files for pulling
2161 // their private images from different registries.
2469 // Docker config containing credentails to authenticate with
2470 // docker registry. The secret is expected to be a docker
2471 // config file in JSON format with UTF-8 character encoding.
21622472 optional Secret config = 3;
21632473 }
21642474
21652475 required Type type = 1;
21662476
21672477 // Only one of the following image messages should be set to match
21682478 // the type.
21692479 optional Appc appc = 2;
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Line(s)
23042614 // IPAM service) or a specific IP by adding a NetworkInfo to the
23052615 // ContainerInfo for a task. On a request, specifying neither `protocol`
23062616 // nor `ip_address` means that any available address may be assigned.
23072617 message IPAddress {
23082618 // Specify IP address requirement. Set protocol to the desired value to
23092619 // request the network isolator on the Agent to assign an IP address to the
23102620 // container being launched. If a specific IP address is specified in
23112621 // ip_address, this field should not be set.
2312 optional Protocol protocol = 1;
2622 optional Protocol protocol = 1 [default = IPv4];
23132623
23142624 // Statically assigned IP provided by the Framework. This IP will be
23152625 // assigned to the container by the network isolator module on the Agent.
23162626 // This field should not be used with the protocol field above.
23172627 //
23182628 // If an explicit address is requested but is unavailable, the network
23192629 // isolator should fail the task.
23202630 optional string ip_address = 2;
▲ Show 20 Lines • Show All 92 Lines • ▼ Show 20 Line(s)
24132723}
24142724
24152725
24162726/**
24172727 * Encapsulation for Linux specific configuration.
24182728 * E.g, capabilities, limits etc.
24192729 */
24202730message LinuxInfo {
2421 // Represents the capability whitelist.
2422 optional CapabilityInfo capability_info = 1;
2731 // Since 1.4.0, deprecated in favor of `effective_capabilities`.
2732 optional CapabilityInfo capability_info = 1 [deprecated = true];
2733
2734 // The set of capabilities that are allowed but not initially
2735 // granted to tasks.
2736 optional CapabilityInfo bounding_capabilities = 2;
2737
2738 // Represents the set of capabilities that the task will
2739 // be executed with.
2740 optional CapabilityInfo effective_capabilities = 3;
2741
2742 // If set as 'true', the container shares the pid namespace with
2743 // its parent. If the container is a top level container, it will
2744 // share the pid namespace with the agent. If the container is a
2745 // nested container, it will share the pid namespace with its
2746 // parent container. This field will be ignored if 'namespaces/pid'
2747 // isolator is not enabled.
2748 optional bool share_pid_namespace = 4;
24232749}
24242750
24252751
24262752/**
24272753* Encapsulation for POSIX rlimits, see
24282754* http://pubs.opengroup.org/onlinepubs/009695399/functions/getrlimit.html.
24292755* Note that some types might only be defined for Linux.
24302756* We use a custom prefix to avoid conflict with existing system macros
▲ Show 20 Lines • Show All 151 Lines • ▼ Show 20 Line(s)
25822908 optional uint32 executor_pid = 3;
25832909}
25842910
25852911
25862912/**
25872913 * Linux control group (cgroup) information.
25882914 */
25892915message CgroupInfo {
2916 // Configuration of a blkio cgroup subsystem.
2917 message Blkio {
2918 enum Operation {
2919 UNKNOWN = 0;
2920 TOTAL = 1;
2921 READ = 2;
2922 WRITE = 3;
2923 SYNC = 4;
2924 ASYNC = 5;
2925 }
2926
2927 // Describes a stat value without the device descriptor part.
2928 message Value {
2929 optional Operation op = 1; // Required.
2930 optional uint64 value = 2; // Required.
2931 }
2932
2933 message CFQ {
2934 message Statistics {
2935 // Stats are grouped by block devices. If `device` is not
2936 // set, it represents `Total`.
2937 optional Device.Number device = 1;
2938 // blkio.sectors
2939 optional uint64 sectors = 2;
2940 // blkio.time
2941 optional uint64 time = 3;
2942 // blkio.io_serviced
2943 repeated Value io_serviced = 4;
2944 // blkio.io_service_bytes
2945 repeated Value io_service_bytes = 5;
2946 // blkio.io_service_time
2947 repeated Value io_service_time = 6;
2948 // blkio.io_wait_time
2949 repeated Value io_wait_time = 7;
2950 // blkio.io_merged
2951 repeated Value io_merged = 8;
2952 // blkio.io_queued
2953 repeated Value io_queued = 9;
2954 }
2955
2956 // TODO(jasonlai): Add fields for blkio weight and weight
2957 // device.
2958 }
2959
2960 message Throttling {
2961 message Statistics {
2962 // Stats are grouped by block devices. If `device` is not
2963 // set, it represents `Total`.
2964 optional Device.Number device = 1;
2965 // blkio.throttle.io_serviced
2966 repeated Value io_serviced = 2;
2967 // blkio.throttle.io_service_bytes
2968 repeated Value io_service_bytes = 3;
2969 }
2970
2971 // TODO(jasonlai): Add fields for blkio.throttle.*_device.
2972 }
2973
2974 message Statistics {
2975 repeated CFQ.Statistics cfq = 1;
2976 repeated CFQ.Statistics cfq_recursive = 2;
2977 repeated Throttling.Statistics throttling = 3;
2978 }
2979 }
2980
25902981 // Configuration of a net_cls cgroup subsystem.
25912982 message NetCls {
25922983 // The 32-bit classid consists of two parts, a 16 bit major handle
25932984 // and a 16-bit minor handle. The major and minor handle are
25942985 // represented using the format 0xAAAABBBB, where 0xAAAA is the
25952986 // 16-bit major handle and 0xBBBB is the 16-bit minor handle.
25962987 optional uint32 classid = 1;
25972988 }
▲ Show 20 Lines • Show All 167 Lines • ▼ Show 20 Line(s)
27653156 optional string gid = 7;
27663157}
27673158
27683159
27693160/**
27703161 * Describes information abount a device.
27713162 */
27723163message Device {
2773 required string path = 1;
3164 message Number {
3165 required uint64 major_number = 1;
3166 required uint64 minor_number = 2;
3167 }
3168
3169 optional string path = 1;
3170 optional Number number = 2;
27743171}
27753172
27763173
27773174/**
27783175 * Describes a device whitelist entry that expose from host to container.
27793176 */
27803177message DeviceAccess {
27813178 message Access {
Show All 12 Lines
View Options

src/test/scala/mesosphere/marathon/core/instance/TestTaskBuilder.scala

11package mesosphere.marathon
22package core.instance
33
4import mesosphere.marathon.Protos.MarathonTask
54import mesosphere.marathon.core.condition.Condition
65import mesosphere.marathon.core.pod.MesosContainer
76import mesosphere.marathon.core.task.bus.MesosTaskStatusTestHelper
87import mesosphere.marathon.core.task.state.{ NetworkInfo, NetworkInfoPlaceholder }
98import mesosphere.marathon.core.task.update.TaskUpdateOperation
109import mesosphere.marathon.core.task.{ Task, TaskCondition }
1110import mesosphere.marathon.state.{ PathId, Timestamp }
1211import mesosphere.marathon.test.MarathonTestHelper
▲ Show 20 Lines • Show All 429 Lines • ▼ Show 20 Line(s)
442441 def unhealthyTask(appId: PathId): Task.LaunchedEphemeral = unhealthyTask(Task.Id.forRunSpec(appId))
443442
444443 def unhealthyTask(taskId: Task.Id): Task.LaunchedEphemeral = {
445444 import mesosphere.marathon.test.MarathonTestHelper.Implicits._
446445
447446 runningTask(taskId).withStatus { status =>
448447 status.copy(mesosStatus = status.mesosStatus.map(_.toBuilder.setHealthy(false).build()))
449448 }
450 }
451
452 def lostTask(id: String): MarathonTask = {
453 MarathonTask
454 .newBuilder()
455 .setId(id)
456 .setStatus(statusForState(id, mesos.Protos.TaskState.TASK_LOST))
457 .buildPartial()
458449 }
459450 }
460451
461452}
View Options

src/test/scala/mesosphere/mesos/TaskBuilderTest.scala

Show First 20 Lines • Show All 1932 Lines • ▼ Show 20 Line(s)
19331933 if (protocol != "") b.setProtocol(protocol)
19341934 if (labels.nonEmpty) {
19351935 b.setLabels(labels.toMesosLabels)
19361936 }
19371937 b.build
19381938 }
19391939
19401940 def mesosPorts(ports: MesosProtos.Port*) =
1941 ports.fold(MesosProtos.Ports.newBuilder){
1942 case (builder: MesosProtos.Ports.Builder, p: MesosProtos.Port) =>
1941 ports.foldLeft(MesosProtos.Ports.newBuilder) { (builder, p) =>
19431942 builder.addPorts(p)
1944 }.asInstanceOf[MesosProtos.Ports.Builder]
1943 }
19451944 }
19461945}