HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D304

add Unreachablestrategy to AppUpdate and apply
ClosedAll Users
Actions

Authored by timcharper on Dec 9 2016, 12:56 AM.

Details

Reviewers
aquamatthias
jdef
• jasongilanfarr
meichstedt
jeschkies
Commits
rMARATHONdefbdba869f4: add Unreachablestrategy to AppUpdate and apply
rMARATHON8bbe53899dd7: add Unreachablestrategy to AppUpdate and apply
rMARATHONa8059112b375: add Unreachablestrategy to AppUpdate and apply
Test Plan

...

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.
Changes from before your most recent comment are hidden. Show Older Changes
jeschkies added a subscriber: jeschkies.EditedDec 9 2016, 11:49 AM

Thanks for your work. This fixes #4810, doesn't it?

Is the update not specified in the RAML? Is it just the App?

meichstedt added a subscriber: meichstedt.Dec 9 2016, 12:38 PM

Fun fact is that changing the UnreachableStrategy in the current implementation is neither an upgrade nor a scale change – we don't want any instance to be restart, nor to launch an additional one. But @aquamatthias is right, it must bei either of those, otherwise it's not persisted.

timcharper updated this revision to Diff 1186.Dec 9 2016, 4:41 PM

recognize unreachableStrategy as an upgrade change

timcharper added a comment.Dec 9 2016, 4:43 PM

I think the probability of this change regressing in the future is low. I don't feel like a test is required. If I am outvoted then I will write one.

timcharper retitled this revision from WIP: add Unreachablestrategy to AppUpdate and apply to add Unreachablestrategy to AppUpdate and apply.Dec 9 2016, 4:43 PM
timcharper added reviewers: aquamatthias, • jasongilanfarr, jdef, jeschkies.
meichstedt requested changes to this revision.Dec 9 2016, 4:43 PM
meichstedt added a reviewer: meichstedt.

As @aquamatthias mentioned, the unreachableStrategy must be checked for changes in AppDefinition.isUpgrade – otherwise an AppUpdate that changes only the unreachableStrategy will not be considered a change.

It's probably best to start with an additional test case in AppsResourceTest (and later also in PodsResource) that verifies that a runSpec's unreachableStrategy can be updated.

Refer to DeploymentPlan.dependencyOrderedSteps – since changing the unreachableStrategy is neither a scaleChange nor needsRestart, there will be no deploymentStep and the change will not be persisted. To not restart all instances when changing the strategy, you should either treat it as a Some(ScaleApplication(...)) (not so nice), or dig into the code and see how you can persist the runSpec w/o creating a deployment.

This revision now requires changes to proceed.Dec 9 2016, 4:43 PM
meichstedt accepted this revision.Dec 9 2016, 5:14 PM

Oh I see.

This revision is now accepted and ready to land.Dec 9 2016, 5:14 PM
timcharper added a comment.Dec 9 2016, 5:27 PM

Seems like there’s an additional thing needed for it to persist to zookeeper

jdef accepted this revision.Dec 9 2016, 5:33 PM
timcharper updated this revision to Diff 1197.Dec 9 2016, 9:12 PM

Add tests

jdef added inline comments.Dec 9 2016, 9:19 PM
src/main/proto/marathon.proto
117

interesting that I don't see killSelection in here. @jeschkies ?

src/main/scala/mesosphere/marathon/state/AppDefinition.scala
149

also don't see killSelection here @jeschkies

timcharper updated this revision to Diff 1198.Dec 9 2016, 10:51 PM

le latest

Closed by commit rMARATHONa8059112b375: add Unreachablestrategy to AppUpdate and apply (authored by timcharper). · Explain WhyDec 9 2016, 10:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1199

View Options

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

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 6520 Lines • ▼ Show 20 Line(s)
65216521 /**
65226522 * <code>optional int64 taskKillGracePeriod = 31;</code>
65236523 *
65246524 * <pre>
65256525 * stored as Millis
65266526 * </pre>
65276527 */
65286528 long getTaskKillGracePeriod();
6529
6530 // optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;
6531 /**
6532 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
6533 */
6534 boolean hasUnreachableStrategy();
6535 /**
6536 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
6537 */
6538 mesosphere.marathon.Protos.UnreachableStrategy getUnreachableStrategy();
6539 /**
6540 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
6541 */
6542 mesosphere.marathon.Protos.UnreachableStrategyOrBuilder getUnreachableStrategyOrBuilder();
65296543 }
65306544 /**
65316545 * Protobuf type {@code mesosphere.marathon.ServiceDefinition}
65326546 */
65336547 public static final class ServiceDefinition extends
65346548 com.google.protobuf.GeneratedMessage
65356549 implements ServiceDefinitionOrBuilder {
65366550 // Use ServiceDefinition.newBuilder() to construct.
▲ Show 20 Lines • Show All 288 Lines • ▼ Show 20 Line(s)
68256839 envVarReferences_.add(input.readMessage(mesosphere.marathon.Protos.EnvVarReference.PARSER, extensionRegistry));
68266840 break;
68276841 }
68286842 case 248: {
68296843 bitField0_ |= 0x00040000;
68306844 taskKillGracePeriod_ = input.readInt64();
68316845 break;
68326846 }
6847 case 258: {
6848 mesosphere.marathon.Protos.UnreachableStrategy.Builder subBuilder = null;
6849 if (((bitField0_ & 0x00080000) == 0x00080000)) {
6850 subBuilder = unreachableStrategy_.toBuilder();
68336851 }
6852 unreachableStrategy_ = input.readMessage(mesosphere.marathon.Protos.UnreachableStrategy.PARSER, extensionRegistry);
6853 if (subBuilder != null) {
6854 subBuilder.mergeFrom(unreachableStrategy_);
6855 unreachableStrategy_ = subBuilder.buildPartial();
68346856 }
6857 bitField0_ |= 0x00080000;
6858 break;
6859 }
6860 }
6861 }
68356862 } catch (com.google.protobuf.InvalidProtocolBufferException e) {
68366863 throw e.setUnfinishedMessage(this);
68376864 } catch (java.io.IOException e) {
68386865 throw new com.google.protobuf.InvalidProtocolBufferException(
68396866 e.getMessage()).setUnfinishedMessage(this);
68406867 } finally {
68416868 if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
68426869 resources_ = java.util.Collections.unmodifiableList(resources_);
▲ Show 20 Lines • Show All 928 Lines • ▼ Show 20 Line(s)
77717798 * <pre>
77727799 * stored as Millis
77737800 * </pre>
77747801 */
77757802 public long getTaskKillGracePeriod() {
77767803 return taskKillGracePeriod_;
77777804 }
77787805
7806 // optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;
7807 public static final int UNREACHABLESTRATEGY_FIELD_NUMBER = 32;
7808 private mesosphere.marathon.Protos.UnreachableStrategy unreachableStrategy_;
7809 /**
7810 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
7811 */
7812 public boolean hasUnreachableStrategy() {
7813 return ((bitField0_ & 0x00080000) == 0x00080000);
7814 }
7815 /**
7816 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
7817 */
7818 public mesosphere.marathon.Protos.UnreachableStrategy getUnreachableStrategy() {
7819 return unreachableStrategy_;
7820 }
7821 /**
7822 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
7823 */
7824 public mesosphere.marathon.Protos.UnreachableStrategyOrBuilder getUnreachableStrategyOrBuilder() {
7825 return unreachableStrategy_;
7826 }
7827
77797828 private void initFields() {
77807829 id_ = "";
77817830 cmd_ = org.apache.mesos.Protos.CommandInfo.getDefaultInstance();
77827831 instances_ = 0;
77837832 resources_ = java.util.Collections.emptyList();
77847833 description_ = "";
77857834 ports_ = java.util.Collections.emptyList();
77867835 constraints_ = java.util.Collections.emptyList();
Show All 15 Lines
78027851 lastConfigChangeAt_ = 0L;
78037852 ipAddress_ = mesosphere.marathon.Protos.IpAddress.getDefaultInstance();
78047853 residency_ = mesosphere.marathon.Protos.ResidencyDefinition.getDefaultInstance();
78057854 portDefinitions_ = java.util.Collections.emptyList();
78067855 readinessCheckDefinition_ = java.util.Collections.emptyList();
78077856 secrets_ = java.util.Collections.emptyList();
78087857 envVarReferences_ = java.util.Collections.emptyList();
78097858 taskKillGracePeriod_ = 0L;
7859 unreachableStrategy_ = mesosphere.marathon.Protos.UnreachableStrategy.getDefaultInstance();
78107860 }
78117861 private byte memoizedIsInitialized = -1;
78127862 public final boolean isInitialized() {
78137863 byte isInitialized = memoizedIsInitialized;
78147864 if (isInitialized != -1) return isInitialized == 1;
78157865
78167866 if (!hasId()) {
78177867 memoizedIsInitialized = 0;
▲ Show 20 Lines • Show All 76 Lines • ▼ Show 20 Line(s)
78947944 }
78957945 }
78967946 for (int i = 0; i < getEnvVarReferencesCount(); i++) {
78977947 if (!getEnvVarReferences(i).isInitialized()) {
78987948 memoizedIsInitialized = 0;
78997949 return false;
79007950 }
79017951 }
7952 if (hasUnreachableStrategy()) {
7953 if (!getUnreachableStrategy().isInitialized()) {
7954 memoizedIsInitialized = 0;
7955 return false;
7956 }
7957 }
79027958 memoizedIsInitialized = 1;
79037959 return true;
79047960 }
79057961
79067962 public void writeTo(com.google.protobuf.CodedOutputStream output)
79077963 throws java.io.IOException {
79087964 getSerializedSize();
79097965 if (((bitField0_ & 0x00000001) == 0x00000001)) {
▲ Show 20 Lines • Show All 81 Lines • ▼ Show 20 Line(s)
79918047 output.writeMessage(29, secrets_.get(i));
79928048 }
79938049 for (int i = 0; i < envVarReferences_.size(); i++) {
79948050 output.writeMessage(30, envVarReferences_.get(i));
79958051 }
79968052 if (((bitField0_ & 0x00040000) == 0x00040000)) {
79978053 output.writeInt64(31, taskKillGracePeriod_);
79988054 }
8055 if (((bitField0_ & 0x00080000) == 0x00080000)) {
8056 output.writeMessage(32, unreachableStrategy_);
8057 }
79998058 getUnknownFields().writeTo(output);
80008059 }
80018060
80028061 private int memoizedSerializedSize = -1;
80038062 public int getSerializedSize() {
80048063 int size = memoizedSerializedSize;
80058064 if (size != -1) return size;
80068065
▲ Show 20 Lines • Show All 128 Lines • ▼ Show 20 Line(s)
81358194 for (int i = 0; i < envVarReferences_.size(); i++) {
81368195 size += com.google.protobuf.CodedOutputStream
81378196 .computeMessageSize(30, envVarReferences_.get(i));
81388197 }
81398198 if (((bitField0_ & 0x00040000) == 0x00040000)) {
81408199 size += com.google.protobuf.CodedOutputStream
81418200 .computeInt64Size(31, taskKillGracePeriod_);
81428201 }
8202 if (((bitField0_ & 0x00080000) == 0x00080000)) {
8203 size += com.google.protobuf.CodedOutputStream
8204 .computeMessageSize(32, unreachableStrategy_);
8205 }
81438206 size += getUnknownFields().getSerializedSize();
81448207 memoizedSerializedSize = size;
81458208 return size;
81468209 }
81478210
81488211 private static final long serialVersionUID = 0L;
81498212 @java.lang.Override
81508213 protected java.lang.Object writeReplace()
▲ Show 20 Lines • Show All 107 Lines • ▼ Show 20 Line(s)
82588321 getLabelsFieldBuilder();
82598322 getAcceptedResourceRolesFieldBuilder();
82608323 getIpAddressFieldBuilder();
82618324 getResidencyFieldBuilder();
82628325 getPortDefinitionsFieldBuilder();
82638326 getReadinessCheckDefinitionFieldBuilder();
82648327 getSecretsFieldBuilder();
82658328 getEnvVarReferencesFieldBuilder();
8329 getUnreachableStrategyFieldBuilder();
82668330 }
82678331 }
82688332 private static Builder create() {
82698333 return new Builder();
82708334 }
82718335
82728336 public Builder clear() {
82738337 super.clear();
▲ Show 20 Lines • Show All 112 Lines • ▼ Show 20 Line(s)
83868450 if (envVarReferencesBuilder_ == null) {
83878451 envVarReferences_ = java.util.Collections.emptyList();
83888452 bitField0_ = (bitField0_ & ~0x10000000);
83898453 } else {
83908454 envVarReferencesBuilder_.clear();
83918455 }
83928456 taskKillGracePeriod_ = 0L;
83938457 bitField0_ = (bitField0_ & ~0x20000000);
8458 if (unreachableStrategyBuilder_ == null) {
8459 unreachableStrategy_ = mesosphere.marathon.Protos.UnreachableStrategy.getDefaultInstance();
8460 } else {
8461 unreachableStrategyBuilder_.clear();
8462 }
8463 bitField0_ = (bitField0_ & ~0x40000000);
83948464 return this;
83958465 }
83968466
83978467 public Builder clone() {
83988468 return create().mergeFrom(buildPartial());
83998469 }
84008470
84018471 public com.google.protobuf.Descriptors.Descriptor
▲ Show 20 Lines • Show All 205 Lines • ▼ Show 20 Line(s)
86078677 result.envVarReferences_ = envVarReferences_;
86088678 } else {
86098679 result.envVarReferences_ = envVarReferencesBuilder_.build();
86108680 }
86118681 if (((from_bitField0_ & 0x20000000) == 0x20000000)) {
86128682 to_bitField0_ |= 0x00040000;
86138683 }
86148684 result.taskKillGracePeriod_ = taskKillGracePeriod_;
8685 if (((from_bitField0_ & 0x40000000) == 0x40000000)) {
8686 to_bitField0_ |= 0x00080000;
8687 }
8688 if (unreachableStrategyBuilder_ == null) {
8689 result.unreachableStrategy_ = unreachableStrategy_;
8690 } else {
8691 result.unreachableStrategy_ = unreachableStrategyBuilder_.build();
8692 }
86158693 result.bitField0_ = to_bitField0_;
86168694 onBuilt();
86178695 return result;
86188696 }
86198697
86208698 public Builder mergeFrom(com.google.protobuf.Message other) {
86218699 if (other instanceof mesosphere.marathon.Protos.ServiceDefinition) {
86228700 return mergeFrom((mesosphere.marathon.Protos.ServiceDefinition)other);
▲ Show 20 Lines • Show All 303 Lines • ▼ Show 20 Line(s)
89269004 } else {
89279005 envVarReferencesBuilder_.addAllMessages(other.envVarReferences_);
89289006 }
89299007 }
89309008 }
89319009 if (other.hasTaskKillGracePeriod()) {
89329010 setTaskKillGracePeriod(other.getTaskKillGracePeriod());
89339011 }
9012 if (other.hasUnreachableStrategy()) {
9013 mergeUnreachableStrategy(other.getUnreachableStrategy());
9014 }
89349015 this.mergeUnknownFields(other.getUnknownFields());
89359016 return this;
89369017 }
89379018
89389019 public final boolean isInitialized() {
89399020 if (!hasId()) {
89409021
89419022 return false;
▲ Show 20 Lines • Show All 75 Lines • ▼ Show 20 Line(s)
90179098 }
90189099 }
90199100 for (int i = 0; i < getEnvVarReferencesCount(); i++) {
90209101 if (!getEnvVarReferences(i).isInitialized()) {
90219102
90229103 return false;
90239104 }
90249105 }
9106 if (hasUnreachableStrategy()) {
9107 if (!getUnreachableStrategy().isInitialized()) {
9108
9109 return false;
9110 }
9111 }
90259112 return true;
90269113 }
90279114
90289115 public Builder mergeFrom(
90299116 com.google.protobuf.CodedInputStream input,
90309117 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
90319118 throws java.io.IOException {
90329119 mesosphere.marathon.Protos.ServiceDefinition parsedMessage = null;
▲ Show 20 Lines • Show All 3665 Lines • ▼ Show 20 Line(s)
1269812785 */
1269912786 public Builder clearTaskKillGracePeriod() {
1270012787 bitField0_ = (bitField0_ & ~0x20000000);
1270112788 taskKillGracePeriod_ = 0L;
1270212789 onChanged();
1270312790 return this;
1270412791 }
1270512792
12793 // optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;
12794 private mesosphere.marathon.Protos.UnreachableStrategy unreachableStrategy_ = mesosphere.marathon.Protos.UnreachableStrategy.getDefaultInstance();
12795 private com.google.protobuf.SingleFieldBuilder<
12796 mesosphere.marathon.Protos.UnreachableStrategy, mesosphere.marathon.Protos.UnreachableStrategy.Builder, mesosphere.marathon.Protos.UnreachableStrategyOrBuilder> unreachableStrategyBuilder_;
12797 /**
12798 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
12799 */
12800 public boolean hasUnreachableStrategy() {
12801 return ((bitField0_ & 0x40000000) == 0x40000000);
12802 }
12803 /**
12804 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
12805 */
12806 public mesosphere.marathon.Protos.UnreachableStrategy getUnreachableStrategy() {
12807 if (unreachableStrategyBuilder_ == null) {
12808 return unreachableStrategy_;
12809 } else {
12810 return unreachableStrategyBuilder_.getMessage();
12811 }
12812 }
12813 /**
12814 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
12815 */
12816 public Builder setUnreachableStrategy(mesosphere.marathon.Protos.UnreachableStrategy value) {
12817 if (unreachableStrategyBuilder_ == null) {
12818 if (value == null) {
12819 throw new NullPointerException();
12820 }
12821 unreachableStrategy_ = value;
12822 onChanged();
12823 } else {
12824 unreachableStrategyBuilder_.setMessage(value);
12825 }
12826 bitField0_ |= 0x40000000;
12827 return this;
12828 }
12829 /**
12830 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
12831 */
12832 public Builder setUnreachableStrategy(
12833 mesosphere.marathon.Protos.UnreachableStrategy.Builder builderForValue) {
12834 if (unreachableStrategyBuilder_ == null) {
12835 unreachableStrategy_ = builderForValue.build();
12836 onChanged();
12837 } else {
12838 unreachableStrategyBuilder_.setMessage(builderForValue.build());
12839 }
12840 bitField0_ |= 0x40000000;
12841 return this;
12842 }
12843 /**
12844 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
12845 */
12846 public Builder mergeUnreachableStrategy(mesosphere.marathon.Protos.UnreachableStrategy value) {
12847 if (unreachableStrategyBuilder_ == null) {
12848 if (((bitField0_ & 0x40000000) == 0x40000000) &&
12849 unreachableStrategy_ != mesosphere.marathon.Protos.UnreachableStrategy.getDefaultInstance()) {
12850 unreachableStrategy_ =
12851 mesosphere.marathon.Protos.UnreachableStrategy.newBuilder(unreachableStrategy_).mergeFrom(value).buildPartial();
12852 } else {
12853 unreachableStrategy_ = value;
12854 }
12855 onChanged();
12856 } else {
12857 unreachableStrategyBuilder_.mergeFrom(value);
12858 }
12859 bitField0_ |= 0x40000000;
12860 return this;
12861 }
12862 /**
12863 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
12864 */
12865 public Builder clearUnreachableStrategy() {
12866 if (unreachableStrategyBuilder_ == null) {
12867 unreachableStrategy_ = mesosphere.marathon.Protos.UnreachableStrategy.getDefaultInstance();
12868 onChanged();
12869 } else {
12870 unreachableStrategyBuilder_.clear();
12871 }
12872 bitField0_ = (bitField0_ & ~0x40000000);
12873 return this;
12874 }
12875 /**
12876 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
12877 */
12878 public mesosphere.marathon.Protos.UnreachableStrategy.Builder getUnreachableStrategyBuilder() {
12879 bitField0_ |= 0x40000000;
12880 onChanged();
12881 return getUnreachableStrategyFieldBuilder().getBuilder();
12882 }
12883 /**
12884 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
12885 */
12886 public mesosphere.marathon.Protos.UnreachableStrategyOrBuilder getUnreachableStrategyOrBuilder() {
12887 if (unreachableStrategyBuilder_ != null) {
12888 return unreachableStrategyBuilder_.getMessageOrBuilder();
12889 } else {
12890 return unreachableStrategy_;
12891 }
12892 }
12893 /**
12894 * <code>optional .mesosphere.marathon.UnreachableStrategy unreachableStrategy = 32;</code>
12895 */
12896 private com.google.protobuf.SingleFieldBuilder<
12897 mesosphere.marathon.Protos.UnreachableStrategy, mesosphere.marathon.Protos.UnreachableStrategy.Builder, mesosphere.marathon.Protos.UnreachableStrategyOrBuilder>
12898 getUnreachableStrategyFieldBuilder() {
12899 if (unreachableStrategyBuilder_ == null) {
12900 unreachableStrategyBuilder_ = new com.google.protobuf.SingleFieldBuilder<
12901 mesosphere.marathon.Protos.UnreachableStrategy, mesosphere.marathon.Protos.UnreachableStrategy.Builder, mesosphere.marathon.Protos.UnreachableStrategyOrBuilder>(
12902 unreachableStrategy_,
12903 getParentForChildren(),
12904 isClean());
12905 unreachableStrategy_ = null;
12906 }
12907 return unreachableStrategyBuilder_;
12908 }
12909
1270612910 // @@protoc_insertion_point(builder_scope:mesosphere.marathon.ServiceDefinition)
1270712911 }
1270812912
1270912913 static {
1271012914 defaultInstance = new ServiceDefinition(true);
1271112915 defaultInstance.initFields();
1271212916 }
1271312917
1271412918 // @@protoc_insertion_point(class_scope:mesosphere.marathon.ServiceDefinition)
1271512919 }
1271612920
12921 public interface UnreachableStrategyOrBuilder
12922 extends com.google.protobuf.MessageOrBuilder {
12923
12924 // required uint64 inactiveAfterSeconds = 1 [default = 900];
12925 /**
12926 * <code>required uint64 inactiveAfterSeconds = 1 [default = 900];</code>
12927 *
12928 * <pre>
12929 * 15 minutes
12930 * </pre>
12931 */
12932 boolean hasInactiveAfterSeconds();
12933 /**
12934 * <code>required uint64 inactiveAfterSeconds = 1 [default = 900];</code>
12935 *
12936 * <pre>
12937 * 15 minutes
12938 * </pre>
12939 */
12940 long getInactiveAfterSeconds();
12941
12942 // required uint64 expungeAfterSeconds = 2 [default = 604800];
12943 /**
12944 * <code>required uint64 expungeAfterSeconds = 2 [default = 604800];</code>
12945 *
12946 * <pre>
12947 * 7 days
12948 * </pre>
12949 */
12950 boolean hasExpungeAfterSeconds();
12951 /**
12952 * <code>required uint64 expungeAfterSeconds = 2 [default = 604800];</code>
12953 *
12954 * <pre>
12955 * 7 days
12956 * </pre>
12957 */
12958 long getExpungeAfterSeconds();
12959 }
12960 /**
12961 * Protobuf type {@code mesosphere.marathon.UnreachableStrategy}
12962 */
12963 public static final class UnreachableStrategy extends
12964 com.google.protobuf.GeneratedMessage
12965 implements UnreachableStrategyOrBuilder {
12966 // Use UnreachableStrategy.newBuilder() to construct.
12967 private UnreachableStrategy(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
12968 super(builder);
12969 this.unknownFields = builder.getUnknownFields();
12970 }
12971 private UnreachableStrategy(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
12972
12973 private static final UnreachableStrategy defaultInstance;
12974 public static UnreachableStrategy getDefaultInstance() {
12975 return defaultInstance;
12976 }
12977
12978 public UnreachableStrategy getDefaultInstanceForType() {
12979 return defaultInstance;
12980 }
12981
12982 private final com.google.protobuf.UnknownFieldSet unknownFields;
12983 @java.lang.Override
12984 public final com.google.protobuf.UnknownFieldSet
12985 getUnknownFields() {
12986 return this.unknownFields;
12987 }
12988 private UnreachableStrategy(
12989 com.google.protobuf.CodedInputStream input,
12990 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
12991 throws com.google.protobuf.InvalidProtocolBufferException {
12992 initFields();
12993 int mutable_bitField0_ = 0;
12994 com.google.protobuf.UnknownFieldSet.Builder unknownFields =
12995 com.google.protobuf.UnknownFieldSet.newBuilder();
12996 try {
12997 boolean done = false;
12998 while (!done) {
12999 int tag = input.readTag();
13000 switch (tag) {
13001 case 0:
13002 done = true;
13003 break;
13004 default: {
13005 if (!parseUnknownField(input, unknownFields,
13006 extensionRegistry, tag)) {
13007 done = true;
13008 }
13009 break;
13010 }
13011 case 8: {
13012 bitField0_ |= 0x00000001;
13013 inactiveAfterSeconds_ = input.readUInt64();
13014 break;
13015 }
13016 case 16: {
13017 bitField0_ |= 0x00000002;
13018 expungeAfterSeconds_ = input.readUInt64();
13019 break;
13020 }
13021 }
13022 }
13023 } catch (com.google.protobuf.InvalidProtocolBufferException e) {
13024 throw e.setUnfinishedMessage(this);
13025 } catch (java.io.IOException e) {
13026 throw new com.google.protobuf.InvalidProtocolBufferException(
13027 e.getMessage()).setUnfinishedMessage(this);
13028 } finally {
13029 this.unknownFields = unknownFields.build();
13030 makeExtensionsImmutable();
13031 }
13032 }
13033 public static final com.google.protobuf.Descriptors.Descriptor
13034 getDescriptor() {
13035 return mesosphere.marathon.Protos.internal_static_mesosphere_marathon_UnreachableStrategy_descriptor;
13036 }
13037
13038 protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
13039 internalGetFieldAccessorTable() {
13040 return mesosphere.marathon.Protos.internal_static_mesosphere_marathon_UnreachableStrategy_fieldAccessorTable
13041 .ensureFieldAccessorsInitialized(
13042 mesosphere.marathon.Protos.UnreachableStrategy.class, mesosphere.marathon.Protos.UnreachableStrategy.Builder.class);
13043 }
13044
13045 public static com.google.protobuf.Parser<UnreachableStrategy> PARSER =
13046 new com.google.protobuf.AbstractParser<UnreachableStrategy>() {
13047 public UnreachableStrategy parsePartialFrom(
13048 com.google.protobuf.CodedInputStream input,
13049 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13050 throws com.google.protobuf.InvalidProtocolBufferException {
13051 return new UnreachableStrategy(input, extensionRegistry);
13052 }
13053 };
13054
13055 @java.lang.Override
13056 public com.google.protobuf.Parser<UnreachableStrategy> getParserForType() {
13057 return PARSER;
13058 }
13059
13060 private int bitField0_;
13061 // required uint64 inactiveAfterSeconds = 1 [default = 900];
13062 public static final int INACTIVEAFTERSECONDS_FIELD_NUMBER = 1;
13063 private long inactiveAfterSeconds_;
13064 /**
13065 * <code>required uint64 inactiveAfterSeconds = 1 [default = 900];</code>
13066 *
13067 * <pre>
13068 * 15 minutes
13069 * </pre>
13070 */
13071 public boolean hasInactiveAfterSeconds() {
13072 return ((bitField0_ & 0x00000001) == 0x00000001);
13073 }
13074 /**
13075 * <code>required uint64 inactiveAfterSeconds = 1 [default = 900];</code>
13076 *
13077 * <pre>
13078 * 15 minutes
13079 * </pre>
13080 */
13081 public long getInactiveAfterSeconds() {
13082 return inactiveAfterSeconds_;
13083 }
13084
13085 // required uint64 expungeAfterSeconds = 2 [default = 604800];
13086 public static final int EXPUNGEAFTERSECONDS_FIELD_NUMBER = 2;
13087 private long expungeAfterSeconds_;
13088 /**
13089 * <code>required uint64 expungeAfterSeconds = 2 [default = 604800];</code>
13090 *
13091 * <pre>
13092 * 7 days
13093 * </pre>
13094 */
13095 public boolean hasExpungeAfterSeconds() {
13096 return ((bitField0_ & 0x00000002) == 0x00000002);
13097 }
13098 /**
13099 * <code>required uint64 expungeAfterSeconds = 2 [default = 604800];</code>
13100 *
13101 * <pre>
13102 * 7 days
13103 * </pre>
13104 */
13105 public long getExpungeAfterSeconds() {
13106 return expungeAfterSeconds_;
13107 }
13108
13109 private void initFields() {
13110 inactiveAfterSeconds_ = 900L;
13111 expungeAfterSeconds_ = 604800L;
13112 }
13113 private byte memoizedIsInitialized = -1;
13114 public final boolean isInitialized() {
13115 byte isInitialized = memoizedIsInitialized;
13116 if (isInitialized != -1) return isInitialized == 1;
13117
13118 if (!hasInactiveAfterSeconds()) {
13119 memoizedIsInitialized = 0;
13120 return false;
13121 }
13122 if (!hasExpungeAfterSeconds()) {
13123 memoizedIsInitialized = 0;
13124 return false;
13125 }
13126 memoizedIsInitialized = 1;
13127 return true;
13128 }
13129
13130 public void writeTo(com.google.protobuf.CodedOutputStream output)
13131 throws java.io.IOException {
13132 getSerializedSize();
13133 if (((bitField0_ & 0x00000001) == 0x00000001)) {
13134 output.writeUInt64(1, inactiveAfterSeconds_);
13135 }
13136 if (((bitField0_ & 0x00000002) == 0x00000002)) {
13137 output.writeUInt64(2, expungeAfterSeconds_);
13138 }
13139 getUnknownFields().writeTo(output);
13140 }
13141
13142 private int memoizedSerializedSize = -1;
13143 public int getSerializedSize() {
13144 int size = memoizedSerializedSize;
13145 if (size != -1) return size;
13146
13147 size = 0;
13148 if (((bitField0_ & 0x00000001) == 0x00000001)) {
13149 size += com.google.protobuf.CodedOutputStream
13150 .computeUInt64Size(1, inactiveAfterSeconds_);
13151 }
13152 if (((bitField0_ & 0x00000002) == 0x00000002)) {
13153 size += com.google.protobuf.CodedOutputStream
13154 .computeUInt64Size(2, expungeAfterSeconds_);
13155 }
13156 size += getUnknownFields().getSerializedSize();
13157 memoizedSerializedSize = size;
13158 return size;
13159 }
13160
13161 private static final long serialVersionUID = 0L;
13162 @java.lang.Override
13163 protected java.lang.Object writeReplace()
13164 throws java.io.ObjectStreamException {
13165 return super.writeReplace();
13166 }
13167
13168 public static mesosphere.marathon.Protos.UnreachableStrategy parseFrom(
13169 com.google.protobuf.ByteString data)
13170 throws com.google.protobuf.InvalidProtocolBufferException {
13171 return PARSER.parseFrom(data);
13172 }
13173 public static mesosphere.marathon.Protos.UnreachableStrategy parseFrom(
13174 com.google.protobuf.ByteString data,
13175 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13176 throws com.google.protobuf.InvalidProtocolBufferException {
13177 return PARSER.parseFrom(data, extensionRegistry);
13178 }
13179 public static mesosphere.marathon.Protos.UnreachableStrategy parseFrom(byte[] data)
13180 throws com.google.protobuf.InvalidProtocolBufferException {
13181 return PARSER.parseFrom(data);
13182 }
13183 public static mesosphere.marathon.Protos.UnreachableStrategy parseFrom(
13184 byte[] data,
13185 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13186 throws com.google.protobuf.InvalidProtocolBufferException {
13187 return PARSER.parseFrom(data, extensionRegistry);
13188 }
13189 public static mesosphere.marathon.Protos.UnreachableStrategy parseFrom(java.io.InputStream input)
13190 throws java.io.IOException {
13191 return PARSER.parseFrom(input);
13192 }
13193 public static mesosphere.marathon.Protos.UnreachableStrategy parseFrom(
13194 java.io.InputStream input,
13195 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13196 throws java.io.IOException {
13197 return PARSER.parseFrom(input, extensionRegistry);
13198 }
13199 public static mesosphere.marathon.Protos.UnreachableStrategy parseDelimitedFrom(java.io.InputStream input)
13200 throws java.io.IOException {
13201 return PARSER.parseDelimitedFrom(input);
13202 }
13203 public static mesosphere.marathon.Protos.UnreachableStrategy parseDelimitedFrom(
13204 java.io.InputStream input,
13205 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13206 throws java.io.IOException {
13207 return PARSER.parseDelimitedFrom(input, extensionRegistry);
13208 }
13209 public static mesosphere.marathon.Protos.UnreachableStrategy parseFrom(
13210 com.google.protobuf.CodedInputStream input)
13211 throws java.io.IOException {
13212 return PARSER.parseFrom(input);
13213 }
13214 public static mesosphere.marathon.Protos.UnreachableStrategy parseFrom(
13215 com.google.protobuf.CodedInputStream input,
13216 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13217 throws java.io.IOException {
13218 return PARSER.parseFrom(input, extensionRegistry);
13219 }
13220
13221 public static Builder newBuilder() { return Builder.create(); }
13222 public Builder newBuilderForType() { return newBuilder(); }
13223 public static Builder newBuilder(mesosphere.marathon.Protos.UnreachableStrategy prototype) {
13224 return newBuilder().mergeFrom(prototype);
13225 }
13226 public Builder toBuilder() { return newBuilder(this); }
13227
13228 @java.lang.Override
13229 protected Builder newBuilderForType(
13230 com.google.protobuf.GeneratedMessage.BuilderParent parent) {
13231 Builder builder = new Builder(parent);
13232 return builder;
13233 }
13234 /**
13235 * Protobuf type {@code mesosphere.marathon.UnreachableStrategy}
13236 */
13237 public static final class Builder extends
13238 com.google.protobuf.GeneratedMessage.Builder<Builder>
13239 implements mesosphere.marathon.Protos.UnreachableStrategyOrBuilder {
13240 public static final com.google.protobuf.Descriptors.Descriptor
13241 getDescriptor() {
13242 return mesosphere.marathon.Protos.internal_static_mesosphere_marathon_UnreachableStrategy_descriptor;
13243 }
13244
13245 protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
13246 internalGetFieldAccessorTable() {
13247 return mesosphere.marathon.Protos.internal_static_mesosphere_marathon_UnreachableStrategy_fieldAccessorTable
13248 .ensureFieldAccessorsInitialized(
13249 mesosphere.marathon.Protos.UnreachableStrategy.class, mesosphere.marathon.Protos.UnreachableStrategy.Builder.class);
13250 }
13251
13252 // Construct using mesosphere.marathon.Protos.UnreachableStrategy.newBuilder()
13253 private Builder() {
13254 maybeForceBuilderInitialization();
13255 }
13256
13257 private Builder(
13258 com.google.protobuf.GeneratedMessage.BuilderParent parent) {
13259 super(parent);
13260 maybeForceBuilderInitialization();
13261 }
13262 private void maybeForceBuilderInitialization() {
13263 if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
13264 }
13265 }
13266 private static Builder create() {
13267 return new Builder();
13268 }
13269
13270 public Builder clear() {
13271 super.clear();
13272 inactiveAfterSeconds_ = 900L;
13273 bitField0_ = (bitField0_ & ~0x00000001);
13274 expungeAfterSeconds_ = 604800L;
13275 bitField0_ = (bitField0_ & ~0x00000002);
13276 return this;
13277 }
13278
13279 public Builder clone() {
13280 return create().mergeFrom(buildPartial());
13281 }
13282
13283 public com.google.protobuf.Descriptors.Descriptor
13284 getDescriptorForType() {
13285 return mesosphere.marathon.Protos.internal_static_mesosphere_marathon_UnreachableStrategy_descriptor;
13286 }
13287
13288 public mesosphere.marathon.Protos.UnreachableStrategy getDefaultInstanceForType() {
13289 return mesosphere.marathon.Protos.UnreachableStrategy.getDefaultInstance();
13290 }
13291
13292 public mesosphere.marathon.Protos.UnreachableStrategy build() {
13293 mesosphere.marathon.Protos.UnreachableStrategy result = buildPartial();
13294 if (!result.isInitialized()) {
13295 throw newUninitializedMessageException(result);
13296 }
13297 return result;
13298 }
13299
13300 public mesosphere.marathon.Protos.UnreachableStrategy buildPartial() {
13301 mesosphere.marathon.Protos.UnreachableStrategy result = new mesosphere.marathon.Protos.UnreachableStrategy(this);
13302 int from_bitField0_ = bitField0_;
13303 int to_bitField0_ = 0;
13304 if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
13305 to_bitField0_ |= 0x00000001;
13306 }
13307 result.inactiveAfterSeconds_ = inactiveAfterSeconds_;
13308 if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
13309 to_bitField0_ |= 0x00000002;
13310 }
13311 result.expungeAfterSeconds_ = expungeAfterSeconds_;
13312 result.bitField0_ = to_bitField0_;
13313 onBuilt();
13314 return result;
13315 }
13316
13317 public Builder mergeFrom(com.google.protobuf.Message other) {
13318 if (other instanceof mesosphere.marathon.Protos.UnreachableStrategy) {
13319 return mergeFrom((mesosphere.marathon.Protos.UnreachableStrategy)other);
13320 } else {
13321 super.mergeFrom(other);
13322 return this;
13323 }
13324 }
13325
13326 public Builder mergeFrom(mesosphere.marathon.Protos.UnreachableStrategy other) {
13327 if (other == mesosphere.marathon.Protos.UnreachableStrategy.getDefaultInstance()) return this;
13328 if (other.hasInactiveAfterSeconds()) {
13329 setInactiveAfterSeconds(other.getInactiveAfterSeconds());
13330 }
13331 if (other.hasExpungeAfterSeconds()) {
13332 setExpungeAfterSeconds(other.getExpungeAfterSeconds());
13333 }
13334 this.mergeUnknownFields(other.getUnknownFields());
13335 return this;
13336 }
13337
13338 public final boolean isInitialized() {
13339 if (!hasInactiveAfterSeconds()) {
13340
13341 return false;
13342 }
13343 if (!hasExpungeAfterSeconds()) {
13344
13345 return false;
13346 }
13347 return true;
13348 }
13349
13350 public Builder mergeFrom(
13351 com.google.protobuf.CodedInputStream input,
13352 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13353 throws java.io.IOException {
13354 mesosphere.marathon.Protos.UnreachableStrategy parsedMessage = null;
13355 try {
13356 parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
13357 } catch (com.google.protobuf.InvalidProtocolBufferException e) {
13358 parsedMessage = (mesosphere.marathon.Protos.UnreachableStrategy) e.getUnfinishedMessage();
13359 throw e;
13360 } finally {
13361 if (parsedMessage != null) {
13362 mergeFrom(parsedMessage);
13363 }
13364 }
13365 return this;
13366 }
13367 private int bitField0_;
13368
13369 // required uint64 inactiveAfterSeconds = 1 [default = 900];
13370 private long inactiveAfterSeconds_ = 900L;
13371 /**
13372 * <code>required uint64 inactiveAfterSeconds = 1 [default = 900];</code>
13373 *
13374 * <pre>
13375 * 15 minutes
13376 * </pre>
13377 */
13378 public boolean hasInactiveAfterSeconds() {
13379 return ((bitField0_ & 0x00000001) == 0x00000001);
13380 }
13381 /**
13382 * <code>required uint64 inactiveAfterSeconds = 1 [default = 900];</code>
13383 *
13384 * <pre>
13385 * 15 minutes
13386 * </pre>
13387 */
13388 public long getInactiveAfterSeconds() {
13389 return inactiveAfterSeconds_;
13390 }
13391 /**
13392 * <code>required uint64 inactiveAfterSeconds = 1 [default = 900];</code>
13393 *
13394 * <pre>
13395 * 15 minutes
13396 * </pre>
13397 */
13398 public Builder setInactiveAfterSeconds(long value) {
13399 bitField0_ |= 0x00000001;
13400 inactiveAfterSeconds_ = value;
13401 onChanged();
13402 return this;
13403 }
13404 /**
13405 * <code>required uint64 inactiveAfterSeconds = 1 [default = 900];</code>
13406 *
13407 * <pre>
13408 * 15 minutes
13409 * </pre>
13410 */
13411 public Builder clearInactiveAfterSeconds() {
13412 bitField0_ = (bitField0_ & ~0x00000001);
13413 inactiveAfterSeconds_ = 900L;
13414 onChanged();
13415 return this;
13416 }
13417
13418 // required uint64 expungeAfterSeconds = 2 [default = 604800];
13419 private long expungeAfterSeconds_ = 604800L;
13420 /**
13421 * <code>required uint64 expungeAfterSeconds = 2 [default = 604800];</code>
13422 *
13423 * <pre>
13424 * 7 days
13425 * </pre>
13426 */
13427 public boolean hasExpungeAfterSeconds() {
13428 return ((bitField0_ & 0x00000002) == 0x00000002);
13429 }
13430 /**
13431 * <code>required uint64 expungeAfterSeconds = 2 [default = 604800];</code>
13432 *
13433 * <pre>
13434 * 7 days
13435 * </pre>
13436 */
13437 public long getExpungeAfterSeconds() {
13438 return expungeAfterSeconds_;
13439 }
13440 /**
13441 * <code>required uint64 expungeAfterSeconds = 2 [default = 604800];</code>
13442 *
13443 * <pre>
13444 * 7 days
13445 * </pre>
13446 */
13447 public Builder setExpungeAfterSeconds(long value) {
13448 bitField0_ |= 0x00000002;
13449 expungeAfterSeconds_ = value;
13450 onChanged();
13451 return this;
13452 }
13453 /**
13454 * <code>required uint64 expungeAfterSeconds = 2 [default = 604800];</code>
13455 *
13456 * <pre>
13457 * 7 days
13458 * </pre>
13459 */
13460 public Builder clearExpungeAfterSeconds() {
13461 bitField0_ = (bitField0_ & ~0x00000002);
13462 expungeAfterSeconds_ = 604800L;
13463 onChanged();
13464 return this;
13465 }
13466
13467 // @@protoc_insertion_point(builder_scope:mesosphere.marathon.UnreachableStrategy)
13468 }
13469
13470 static {
13471 defaultInstance = new UnreachableStrategy(true);
13472 defaultInstance.initFields();
13473 }
13474
13475 // @@protoc_insertion_point(class_scope:mesosphere.marathon.UnreachableStrategy)
13476 }
13477
1271713478 public interface JsonOrBuilder
1271813479 extends com.google.protobuf.MessageOrBuilder {
1271913480
1272013481 // required string json = 1;
1272113482 /**
1272213483 * <code>required string json = 1;</code>
1272313484 */
1272413485 boolean hasJson();
▲ Show 20 Lines • Show All 30092 Lines • ▼ Show 20 Line(s)
4281743578 com.google.protobuf.GeneratedMessage.FieldAccessorTable
4281843579 internal_static_mesosphere_marathon_DiscoveryInfo_fieldAccessorTable;
4281943580 private static com.google.protobuf.Descriptors.Descriptor
4282043581 internal_static_mesosphere_marathon_ServiceDefinition_descriptor;
4282143582 private static
4282243583 com.google.protobuf.GeneratedMessage.FieldAccessorTable
4282343584 internal_static_mesosphere_marathon_ServiceDefinition_fieldAccessorTable;
4282443585 private static com.google.protobuf.Descriptors.Descriptor
43586 internal_static_mesosphere_marathon_UnreachableStrategy_descriptor;
43587 private static
43588 com.google.protobuf.GeneratedMessage.FieldAccessorTable
43589 internal_static_mesosphere_marathon_UnreachableStrategy_fieldAccessorTable;
43590 private static com.google.protobuf.Descriptors.Descriptor
4282543591 internal_static_mesosphere_marathon_Json_descriptor;
4282643592 private static
4282743593 com.google.protobuf.GeneratedMessage.FieldAccessorTable
4282843594 internal_static_mesosphere_marathon_Json_fieldAccessorTable;
4282943595 private static com.google.protobuf.Descriptors.Descriptor
4283043596 internal_static_mesosphere_marathon_ResourceRoles_descriptor;
4283143597 private static
4283243598 com.google.protobuf.GeneratedMessage.FieldAccessorTable
▲ Show 20 Lines • Show All 162 Lines • ▼ Show 20 Line(s)
4299543761 "\t\022\026\n\016intervalMillis\030\005 \001(\004\022\025\n\rtimeoutMill" +
4299643762 "is\030\006 \001(\004\022\036\n\026httpStatusCodeForReady\030\007 \003(\r" +
4299743763 "\022\034\n\024preserveLastResponse\030\010 \001(\010\"\037\n\010Protoc" +
4299843764 "ol\022\010\n\004HTTP\020\000\022\t\n\005HTTPS\020\001\"\211\001\n\tIpAddress\022\016\n" +
4299943765 "\006groups\030\001 \003(\t\022\034\n\006labels\030\002 \003(\0132\014.mesos.La" +
4300043766 "bel\0229\n\rdiscoveryInfo\030\003 \001(\0132\".mesosphere." +
4300143767 "marathon.DiscoveryInfo\022\023\n\013networkName\030\004 " +
4300243768 "\001(\t\"+\n\rDiscoveryInfo\022\032\n\005ports\030\001 \003(\0132\013.me",
43003 "sos.Port\"\305\t\n\021ServiceDefinition\022\n\n\002id\030\001 \002" +
43769 "sos.Port\"\214\n\n\021ServiceDefinition\022\n\n\002id\030\001 \002" +
4300443770 "(\t\022\037\n\003cmd\030\002 \002(\0132\022.mesos.CommandInfo\022\021\n\ti" +
4300543771 "nstances\030\003 \002(\r\022\"\n\tresources\030\004 \003(\0132\017.meso" +
4300643772 "s.Resource\022\023\n\013description\030\005 \001(\t\022\r\n\005ports" +
4300743773 "\030\006 \003(\r\0224\n\013constraints\030\007 \003(\0132\037.mesosphere" +
4300843774 ".marathon.Constraint\022\022\n\010executor\030\010 \002(\t:\000" +
4300943775 "\022>\n\022OBSOLETE_container\030\n \001(\0132\".mesospher" +
4301043776 "e.marathon.ContainerInfo\022)\n\007version\030\013 \001(" +
4301143777 "\t:\0301970-01-01T00:00:00.000Z\022@\n\014healthChe" +
Show All 13 Lines
4302543791 "\0132\036.mesosphere.marathon.IpAddress\022;\n\tres" +
4302643792 "idency\030\032 \001(\0132(.mesosphere.marathon.Resid" +
4302743793 "encyDefinition\022$\n\017portDefinitions\030\033 \003(\0132" +
4302843794 "\013.mesos.Port\022O\n\030readinessCheckDefinition" +
4302943795 "\030\034 \003(\0132-.mesosphere.marathon.ReadinessCh" +
4303043796 "eckDefinition\022,\n\007secrets\030\035 \003(\0132\033.mesosph" +
4303143797 "ere.marathon.Secret\022>\n\020envVarReferences\030" +
4303243798 "\036 \003(\0132$.mesosphere.marathon.EnvVarRefere",
43033 "nce\022\033\n\023taskKillGracePeriod\030\037 \001(\003\"\024\n\004Json" +
43034 "\022\014\n\004json\030\001 \002(\t\"\035\n\rResourceRoles\022\014\n\004role\030" +
43035 "\001 \003(\t\"\346\t\n\014MarathonTask\022\n\n\002id\030\001 \002(\t\022\025\n\rOB" +
43036 "SOLETE_host\030\002 \001(\t\022\r\n\005ports\030\003 \003(\r\022-\n\023OBSO" +
43037 "LETE_attributes\030\004 \003(\0132\020.mesos.Attribute\022" +
43038 "\021\n\tstaged_at\030\005 \001(\003\022\022\n\nstarted_at\030\006 \001(\003\022," +
43039 "\n\021OBSOLETE_statuses\030\007 \003(\0132\021.mesos.TaskSt" +
43040 "atus\022)\n\007version\030\010 \001(\t:\0301970-01-01T00:00:" +
43041 "00.000Z\022!\n\006status\030\t \001(\0132\021.mesos.TaskStat" +
43042 "us\022(\n\020OBSOLETE_slaveId\030\n \001(\0132\016.mesos.Sla",
43043 "veID\022-\n\021OBSOLETE_networks\030\013 \003(\0132\022.mesos." +
43044 "NetworkInfo\022B\n\013reservation\030\014 \001(\0132-.mesos" +
43045 "phere.marathon.MarathonTask.Reservation\022" +
43046 ">\n\tcondition\030\r \001(\0162+.mesosphere.marathon" +
43047 ".MarathonTask.Condition\032\231\004\n\013Reservation\022" +
43048 "\030\n\020local_volume_ids\030\001 \003(\t\022B\n\005state\030\002 \002(\013" +
43049 "23.mesosphere.marathon.MarathonTask.Rese" +
43050 "rvation.State\032\253\003\n\005State\022F\n\004type\030\001 \002(\01628." +
43051 "mesosphere.marathon.MarathonTask.Reserva" +
43052 "tion.State.Type\022L\n\007timeout\030\002 \001(\0132;.mesos",
43053 "phere.marathon.MarathonTask.Reservation." +
43054 "State.Timeout\032\303\001\n\007Timeout\022\021\n\tinitiated\030\001" +
43055 " \002(\003\022\020\n\010deadline\030\002 \002(\003\022R\n\006reason\030\003 \002(\0162B" +
43799 "nce\022\033\n\023taskKillGracePeriod\030\037 \001(\003\022E\n\023unre" +
43800 "achableStrategy\030 \001(\0132(.mesosphere.marat" +
43801 "hon.UnreachableStrategy\"]\n\023UnreachableSt" +
43802 "rategy\022!\n\024inactiveAfterSeconds\030\001 \002(\004:\00390" +
43803 "0\022#\n\023expungeAfterSeconds\030\002 \002(\004:\006604800\"\024" +
43804 "\n\004Json\022\014\n\004json\030\001 \002(\t\"\035\n\rResourceRoles\022\014\n" +
43805 "\004role\030\001 \003(\t\"\346\t\n\014MarathonTask\022\n\n\002id\030\001 \002(\t" +
43806 "\022\025\n\rOBSOLETE_host\030\002 \001(\t\022\r\n\005ports\030\003 \003(\r\022-" +
43807 "\n\023OBSOLETE_attributes\030\004 \003(\0132\020.mesos.Attr" +
43808 "ibute\022\021\n\tstaged_at\030\005 \001(\003\022\022\n\nstarted_at\030\006",
43809 " \001(\003\022,\n\021OBSOLETE_statuses\030\007 \003(\0132\021.mesos." +
43810 "TaskStatus\022)\n\007version\030\010 \001(\t:\0301970-01-01T" +
43811 "00:00:00.000Z\022!\n\006status\030\t \001(\0132\021.mesos.Ta" +
43812 "skStatus\022(\n\020OBSOLETE_slaveId\030\n \001(\0132\016.mes" +
43813 "os.SlaveID\022-\n\021OBSOLETE_networks\030\013 \003(\0132\022." +
43814 "mesos.NetworkInfo\022B\n\013reservation\030\014 \001(\0132-" +
4305643815 ".mesosphere.marathon.MarathonTask.Reserv" +
43057 "ation.State.Timeout.Reason\"?\n\006Reason\022\035\n\031" +
43058 "RelaunchEscalationTimeout\020\001\022\026\n\022Reservati" +
43059 "onTimeout\020\002\"F\n\004Type\022\007\n\003New\020\001\022\014\n\010Launched" +
43060 "\020\002\022\r\n\tSuspended\020\003\022\013\n\007Garbage\020\004\022\013\n\007Unknow" +
43061 "n\020\005\"\330\001\n\tCondition\022\013\n\007Invalid\020\000\022\014\n\010Reserv" +
43062 "ed\020\001\022\013\n\007Created\020\002\022\t\n\005Error\020\003\022\n\n\006Failed\020\004",
43063 "\022\014\n\010Finished\020\005\022\n\n\006Killed\020\006\022\013\n\007Killing\020\007\022" +
43064 "\010\n\004Lost\020\010\022\013\n\007Running\020\t\022\013\n\007Staging\020\n\022\014\n\010S" +
43065 "tarting\020\013\022\017\n\013Unreachable\020\014\022\010\n\004Gone\020\r\022\013\n\007" +
43066 "Unknown\020\016\022\013\n\007Dropped\020\017\"M\n\013MarathonApp\022\014\n" +
43067 "\004name\030\001 \001(\t\0220\n\005tasks\030\002 \003(\0132!.mesosphere." +
43068 "marathon.MarathonTask\"1\n\rContainerInfo\022\017" +
43069 "\n\005image\030\001 \002(\014:\000\022\017\n\007options\030\002 \003(\014\"\277\007\n\025Ext" +
43070 "endedContainerInfo\022\'\n\004type\030\001 \002(\0162\031.mesos" +
43071 ".ContainerInfo.Type\022,\n\007volumes\030\002 \003(\0132\033.m" +
43072 "esosphere.marathon.Volume\022E\n\006docker\030\003 \001(",
43073 "\01325.mesosphere.marathon.ExtendedContaine" +
43074 "rInfo.DockerInfo\022O\n\013mesosDocker\030\004 \001(\0132:." +
43075 "mesosphere.marathon.ExtendedContainerInf" +
43076 "o.MesosDockerInfo\022K\n\tmesosAppC\030\005 \001(\01328.m" +
43077 "esosphere.marathon.ExtendedContainerInfo" +
43078 ".MesosAppCInfo\032\242\003\n\nDockerInfo\022\r\n\005image\030\001" +
43079 " \002(\t\022>\n\007network\030\002 \001(\0162\'.mesos.ContainerI" +
43080 "nfo.DockerInfo.Network:\004HOST\022X\n\rport_map" +
43081 "pings\030\003 \003(\0132A.mesosphere.marathon.Extend" +
43082 "edContainerInfo.DockerInfo.PortMapping\022\031",
43083 "\n\nprivileged\030\004 \001(\010:\005false\022$\n\nparameters\030" +
43084 "\005 \003(\0132\020.mesos.Parameter\022\030\n\020force_pull_im" +
43085 "age\030\006 \001(\010\032\217\001\n\013PortMapping\022\021\n\thost_port\030\001" +
43086 " \001(\r\022\026\n\016container_port\030\002 \002(\r\022\020\n\010protocol" +
43087 "\030\003 \001(\t\022\014\n\004name\030\004 \001(\t\022\034\n\006labels\030\005 \003(\0132\014.m" +
43088 "esos.Label\022\027\n\014service_port\030d \001(\r:\0010\032a\n\017M" +
43089 "esosDockerInfo\022\r\n\005image\030\001 \002(\t\022%\n\ncredent" +
43090 "ial\030\002 \001(\0132\021.mesos.Credential\022\030\n\020force_pu" +
43091 "ll_image\030\003 \001(\010\032b\n\rMesosAppCInfo\022\r\n\005image" +
43092 "\030\001 \002(\t\022\n\n\002id\030\002 \001(\t\022\034\n\006labels\030\003 \003(\0132\014.mes",
43093 "os.Label\022\030\n\020force_pull_image\030\004 \001(\010\"\377\003\n\006V" +
43094 "olume\022 \n\004mode\030\003 \002(\0162\022.mesos.Volume.Mode\022" +
43095 "\026\n\016container_path\030\001 \002(\t\022\021\n\thost_path\030\002 \001" +
43096 "(\t\022\033\n\005image\030\004 \001(\0132\014.mesos.Image\022D\n\npersi" +
43097 "stent\030\005 \001(\01320.mesosphere.marathon.Volume" +
43098 ".PersistentVolumeInfo\022@\n\010external\030\006 \001(\0132" +
43099 "..mesosphere.marathon.Volume.ExternalVol" +
43100 "umeInfo\032\237\001\n\024PersistentVolumeInfo\022\014\n\004size" +
43101 "\030\001 \002(\004\0222\n\004type\030\002 \001(\0162$.mesos.Resource.Di" +
43102 "skInfo.Source.Type\0224\n\013constraints\030\003 \003(\0132",
43103 "\037.mesosphere.marathon.Constraint\022\017\n\007maxS" +
43104 "ize\030\004 \001(\004\032a\n\022ExternalVolumeInfo\022\014\n\004size\030" +
43105 "\001 \001(\004\022\014\n\004name\030\002 \002(\t\022\020\n\010provider\030\003 \002(\t\022\035\n" +
43106 "\007options\030\004 \003(\0132\014.mesos.Label\")\n\020EventSub" +
43107 "scribers\022\025\n\rcallback_urls\030\001 \003(\t\"\274\001\n\016Stor" +
43108 "ageVersion\022\r\n\005major\030\001 \002(\r\022\r\n\005minor\030\002 \002(\r" +
43109 "\022\r\n\005patch\030\003 \002(\r\022I\n\006format\030\004 \001(\01621.mesosp" +
43110 "here.marathon.StorageVersion.StorageForm" +
43111 "at:\006LEGACY\"2\n\rStorageFormat\022\n\n\006LEGACY\020\000\022" +
43112 "\025\n\021PERSISTENCE_STORE\020\001\"Z\n\031UpgradeStrateg",
43113 "yDefinition\022\035\n\025minimumHealthCapacity\030\001 \002" +
43114 "(\001\022\036\n\023maximumOverCapacity\030\002 \001(\001:\0011\"\236\003\n\017G" +
43115 "roupDefinition\022\n\n\002id\030\001 \002(\t\022\017\n\007version\030\002 " +
43116 "\002(\t\022?\n\017deprecated_apps\030\003 \003(\0132&.mesospher" +
43117 "e.marathon.ServiceDefinition\0222\n\017deprecat" +
43118 "ed_pods\030\010 \003(\0132\031.mesosphere.marathon.Json" +
43119 "\0224\n\006groups\030\004 \003(\0132$.mesosphere.marathon.G" +
43120 "roupDefinition\022\024\n\014dependencies\030\005 \003(\t\022?\n\004" +
43121 "apps\030\006 \003(\01321.mesosphere.marathon.GroupDe" +
43122 "finition.AppReference\022?\n\004pods\030\007 \003(\01321.me",
43123 "sosphere.marathon.GroupDefinition.AppRef" +
43124 "erence\032+\n\014AppReference\022\n\n\002id\030\001 \002(\t\022\017\n\007ve" +
43125 "rsion\030\002 \002(\t\"\371\001\n\030DeploymentPlanDefinition" +
43126 "\022\n\n\002id\030\001 \002(\t\022\021\n\ttimestamp\030\002 \001(\t\022A\n\023depre" +
43127 "cated_original\030\004 \001(\0132$.mesosphere.marath" +
43128 "on.GroupDefinition\022?\n\021deprecated_target\030" +
43129 "\005 \001(\0132$.mesosphere.marathon.GroupDefinit" +
43130 "ion\022\035\n\025original_root_version\030\006 \001(\t\022\033\n\023ta" +
43131 "rget_root_version\030\007 \001(\t\"\306\001\n\013TaskFailure\022" +
43132 "\016\n\006app_id\030\001 \002(\t\022\036\n\007task_id\030\002 \002(\0132\r.mesos",
43133 ".TaskID\022\037\n\005state\030\003 \002(\0162\020.mesos.TaskState" +
43134 "\022\021\n\007message\030\004 \001(\t:\000\022\016\n\004host\030\005 \001(\t:\000\022\017\n\007v" +
43135 "ersion\030\006 \002(\t\022\021\n\ttimestamp\030\007 \002(\t\022\037\n\007slave" +
43136 "Id\030\010 \001(\0132\016.mesos.SlaveID\"T\n\014ZKStoreEntry" +
43137 "\022\014\n\004name\030\001 \002(\t\022\014\n\004uuid\030\002 \002(\014\022\r\n\005value\030\003 " +
43138 "\002(\014\022\031\n\ncompressed\030\004 \001(\010:\005false\"\326\001\n\023Resid" +
43139 "encyDefinition\022(\n relaunchEscalationTime" +
43140 "outSeconds\030\001 \001(\003\022S\n\020taskLostBehavior\030\002 \001" +
43141 "(\01629.mesosphere.marathon.ResidencyDefini" +
43142 "tion.TaskLostBehavior\"@\n\020TaskLostBehavio",
43143 "r\022\032\n\026RELAUNCH_AFTER_TIMEOUT\020\000\022\020\n\014WAIT_FO" +
43144 "REVER\020\001\"$\n\006Secret\022\n\n\002id\030\001 \002(\t\022\016\n\006source\030" +
43145 "\002 \002(\t\"\262\001\n\017EnvVarReference\0227\n\004type\030\001 \002(\0162" +
43146 ").mesosphere.marathon.EnvVarReference.Ty" +
43147 "pe\022\014\n\004name\030\002 \002(\t\0227\n\tsecretRef\030\003 \001(\0132$.me" +
43148 "sosphere.marathon.EnvVarSecretRef\"\037\n\004Typ" +
43149 "e\022\013\n\007UNKNOWN\020\000\022\n\n\006SECRET\020\001\"#\n\017EnvVarSecr" +
43150 "etRef\022\020\n\010secretId\030\001 \002(\tB\035\n\023mesosphere.ma" +
43151 "rathonB\006Protos"
43816 "ation\022>\n\tcondition\030\r \001(\0162+.mesosphere.ma" +
43817 "rathon.MarathonTask.Condition\032\231\004\n\013Reserv" +
43818 "ation\022\030\n\020local_volume_ids\030\001 \003(\t\022B\n\005state",
43819 "\030\002 \002(\01323.mesosphere.marathon.MarathonTas" +
43820 "k.Reservation.State\032\253\003\n\005State\022F\n\004type\030\001 " +
43821 "\002(\01628.mesosphere.marathon.MarathonTask.R" +
43822 "eservation.State.Type\022L\n\007timeout\030\002 \001(\0132;" +
43823 ".mesosphere.marathon.MarathonTask.Reserv" +
43824 "ation.State.Timeout\032\303\001\n\007Timeout\022\021\n\tiniti" +
43825 "ated\030\001 \002(\003\022\020\n\010deadline\030\002 \002(\003\022R\n\006reason\030\003" +
43826 " \002(\0162B.mesosphere.marathon.MarathonTask." +
43827 "Reservation.State.Timeout.Reason\"?\n\006Reas" +
43828 "on\022\035\n\031RelaunchEscalationTimeout\020\001\022\026\n\022Res",
43829 "ervationTimeout\020\002\"F\n\004Type\022\007\n\003New\020\001\022\014\n\010La" +
43830 "unched\020\002\022\r\n\tSuspended\020\003\022\013\n\007Garbage\020\004\022\013\n\007" +
43831 "Unknown\020\005\"\330\001\n\tCondition\022\013\n\007Invalid\020\000\022\014\n\010" +
43832 "Reserved\020\001\022\013\n\007Created\020\002\022\t\n\005Error\020\003\022\n\n\006Fa" +
43833 "iled\020\004\022\014\n\010Finished\020\005\022\n\n\006Killed\020\006\022\013\n\007Kill" +
43834 "ing\020\007\022\010\n\004Lost\020\010\022\013\n\007Running\020\t\022\013\n\007Staging\020" +
43835 "\n\022\014\n\010Starting\020\013\022\017\n\013Unreachable\020\014\022\010\n\004Gone" +
43836 "\020\r\022\013\n\007Unknown\020\016\022\013\n\007Dropped\020\017\"M\n\013Marathon" +
43837 "App\022\014\n\004name\030\001 \001(\t\0220\n\005tasks\030\002 \003(\0132!.mesos" +
43838 "phere.marathon.MarathonTask\"1\n\rContainer",
43839 "Info\022\017\n\005image\030\001 \002(\014:\000\022\017\n\007options\030\002 \003(\014\"\277" +
43840 "\007\n\025ExtendedContainerInfo\022\'\n\004type\030\001 \002(\0162\031" +
43841 ".mesos.ContainerInfo.Type\022,\n\007volumes\030\002 \003" +
43842 "(\0132\033.mesosphere.marathon.Volume\022E\n\006docke" +
43843 "r\030\003 \001(\01325.mesosphere.marathon.ExtendedCo" +
43844 "ntainerInfo.DockerInfo\022O\n\013mesosDocker\030\004 " +
43845 "\001(\0132:.mesosphere.marathon.ExtendedContai" +
43846 "nerInfo.MesosDockerInfo\022K\n\tmesosAppC\030\005 \001" +
43847 "(\01328.mesosphere.marathon.ExtendedContain" +
43848 "erInfo.MesosAppCInfo\032\242\003\n\nDockerInfo\022\r\n\005i",
43849 "mage\030\001 \002(\t\022>\n\007network\030\002 \001(\0162\'.mesos.Cont" +
43850 "ainerInfo.DockerInfo.Network:\004HOST\022X\n\rpo" +
43851 "rt_mappings\030\003 \003(\0132A.mesosphere.marathon." +
43852 "ExtendedContainerInfo.DockerInfo.PortMap" +
43853 "ping\022\031\n\nprivileged\030\004 \001(\010:\005false\022$\n\nparam" +
43854 "eters\030\005 \003(\0132\020.mesos.Parameter\022\030\n\020force_p" +
43855 "ull_image\030\006 \001(\010\032\217\001\n\013PortMapping\022\021\n\thost_" +
43856 "port\030\001 \001(\r\022\026\n\016container_port\030\002 \002(\r\022\020\n\010pr" +
43857 "otocol\030\003 \001(\t\022\014\n\004name\030\004 \001(\t\022\034\n\006labels\030\005 \003" +
43858 "(\0132\014.mesos.Label\022\027\n\014service_port\030d \001(\r:\001",
43859 "0\032a\n\017MesosDockerInfo\022\r\n\005image\030\001 \002(\t\022%\n\nc" +
43860 "redential\030\002 \001(\0132\021.mesos.Credential\022\030\n\020fo" +
43861 "rce_pull_image\030\003 \001(\010\032b\n\rMesosAppCInfo\022\r\n" +
43862 "\005image\030\001 \002(\t\022\n\n\002id\030\002 \001(\t\022\034\n\006labels\030\003 \003(\013" +
43863 "2\014.mesos.Label\022\030\n\020force_pull_image\030\004 \001(\010" +
43864 "\"\377\003\n\006Volume\022 \n\004mode\030\003 \002(\0162\022.mesos.Volume" +
43865 ".Mode\022\026\n\016container_path\030\001 \002(\t\022\021\n\thost_pa" +
43866 "th\030\002 \001(\t\022\033\n\005image\030\004 \001(\0132\014.mesos.Image\022D\n" +
43867 "\npersistent\030\005 \001(\01320.mesosphere.marathon." +
43868 "Volume.PersistentVolumeInfo\022@\n\010external\030",
43869 "\006 \001(\0132..mesosphere.marathon.Volume.Exter" +
43870 "nalVolumeInfo\032\237\001\n\024PersistentVolumeInfo\022\014" +
43871 "\n\004size\030\001 \002(\004\0222\n\004type\030\002 \001(\0162$.mesos.Resou" +
43872 "rce.DiskInfo.Source.Type\0224\n\013constraints\030" +
43873 "\003 \003(\0132\037.mesosphere.marathon.Constraint\022\017" +
43874 "\n\007maxSize\030\004 \001(\004\032a\n\022ExternalVolumeInfo\022\014\n" +
43875 "\004size\030\001 \001(\004\022\014\n\004name\030\002 \002(\t\022\020\n\010provider\030\003 " +
43876 "\002(\t\022\035\n\007options\030\004 \003(\0132\014.mesos.Label\")\n\020Ev" +
43877 "entSubscribers\022\025\n\rcallback_urls\030\001 \003(\t\"\274\001" +
43878 "\n\016StorageVersion\022\r\n\005major\030\001 \002(\r\022\r\n\005minor",
43879 "\030\002 \002(\r\022\r\n\005patch\030\003 \002(\r\022I\n\006format\030\004 \001(\01621." +
43880 "mesosphere.marathon.StorageVersion.Stora" +
43881 "geFormat:\006LEGACY\"2\n\rStorageFormat\022\n\n\006LEG" +
43882 "ACY\020\000\022\025\n\021PERSISTENCE_STORE\020\001\"Z\n\031UpgradeS" +
43883 "trategyDefinition\022\035\n\025minimumHealthCapaci" +
43884 "ty\030\001 \002(\001\022\036\n\023maximumOverCapacity\030\002 \001(\001:\0011" +
43885 "\"\236\003\n\017GroupDefinition\022\n\n\002id\030\001 \002(\t\022\017\n\007vers" +
43886 "ion\030\002 \002(\t\022?\n\017deprecated_apps\030\003 \003(\0132&.mes" +
43887 "osphere.marathon.ServiceDefinition\0222\n\017de" +
43888 "precated_pods\030\010 \003(\0132\031.mesosphere.maratho",
43889 "n.Json\0224\n\006groups\030\004 \003(\0132$.mesosphere.mara" +
43890 "thon.GroupDefinition\022\024\n\014dependencies\030\005 \003" +
43891 "(\t\022?\n\004apps\030\006 \003(\01321.mesosphere.marathon.G" +
43892 "roupDefinition.AppReference\022?\n\004pods\030\007 \003(" +
43893 "\01321.mesosphere.marathon.GroupDefinition." +
43894 "AppReference\032+\n\014AppReference\022\n\n\002id\030\001 \002(\t" +
43895 "\022\017\n\007version\030\002 \002(\t\"\371\001\n\030DeploymentPlanDefi" +
43896 "nition\022\n\n\002id\030\001 \002(\t\022\021\n\ttimestamp\030\002 \001(\t\022A\n" +
43897 "\023deprecated_original\030\004 \001(\0132$.mesosphere." +
43898 "marathon.GroupDefinition\022?\n\021deprecated_t",
43899 "arget\030\005 \001(\0132$.mesosphere.marathon.GroupD" +
43900 "efinition\022\035\n\025original_root_version\030\006 \001(\t" +
43901 "\022\033\n\023target_root_version\030\007 \001(\t\"\306\001\n\013TaskFa" +
43902 "ilure\022\016\n\006app_id\030\001 \002(\t\022\036\n\007task_id\030\002 \002(\0132\r" +
43903 ".mesos.TaskID\022\037\n\005state\030\003 \002(\0162\020.mesos.Tas" +
43904 "kState\022\021\n\007message\030\004 \001(\t:\000\022\016\n\004host\030\005 \001(\t:" +
43905 "\000\022\017\n\007version\030\006 \002(\t\022\021\n\ttimestamp\030\007 \002(\t\022\037\n" +
43906 "\007slaveId\030\010 \001(\0132\016.mesos.SlaveID\"T\n\014ZKStor" +
43907 "eEntry\022\014\n\004name\030\001 \002(\t\022\014\n\004uuid\030\002 \002(\014\022\r\n\005va" +
43908 "lue\030\003 \002(\014\022\031\n\ncompressed\030\004 \001(\010:\005false\"\326\001\n",
43909 "\023ResidencyDefinition\022(\n relaunchEscalati" +
43910 "onTimeoutSeconds\030\001 \001(\003\022S\n\020taskLostBehavi" +
43911 "or\030\002 \001(\01629.mesosphere.marathon.Residency" +
43912 "Definition.TaskLostBehavior\"@\n\020TaskLostB" +
43913 "ehavior\022\032\n\026RELAUNCH_AFTER_TIMEOUT\020\000\022\020\n\014W" +
43914 "AIT_FOREVER\020\001\"$\n\006Secret\022\n\n\002id\030\001 \002(\t\022\016\n\006s" +
43915 "ource\030\002 \002(\t\"\262\001\n\017EnvVarReference\0227\n\004type\030" +
43916 "\001 \002(\0162).mesosphere.marathon.EnvVarRefere" +
43917 "nce.Type\022\014\n\004name\030\002 \002(\t\0227\n\tsecretRef\030\003 \001(" +
43918 "\0132$.mesosphere.marathon.EnvVarSecretRef\"",
43919 "\037\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006SECRET\020\001\"#\n\017EnvV" +
43920 "arSecretRef\022\020\n\010secretId\030\001 \002(\tB\035\n\023mesosph" +
43921 "ere.marathonB\006Protos"
4315243922 };
4315343923 com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
4315443924 new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
4315543925 public com.google.protobuf.ExtensionRegistry assignDescriptors(
4315643926 com.google.protobuf.Descriptors.FileDescriptor root) {
4315743927 descriptor = root;
4315843928 internal_static_mesosphere_marathon_Constraint_descriptor =
4315943929 getDescriptor().getMessageTypes().get(0);
Show All 25 Lines
4318543955 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4318643956 internal_static_mesosphere_marathon_DiscoveryInfo_descriptor,
4318743957 new java.lang.String[] { "Ports", });
4318843958 internal_static_mesosphere_marathon_ServiceDefinition_descriptor =
4318943959 getDescriptor().getMessageTypes().get(5);
4319043960 internal_static_mesosphere_marathon_ServiceDefinition_fieldAccessorTable = new
4319143961 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4319243962 internal_static_mesosphere_marathon_ServiceDefinition_descriptor,
43193 new java.lang.String[] { "Id", "Cmd", "Instances", "Resources", "Description", "Ports", "Constraints", "Executor", "OBSOLETEContainer", "Version", "HealthChecks", "Backoff", "BackoffFactor", "UpgradeStrategy", "Dependencies", "StoreUrls", "RequirePorts", "Container", "Labels", "MaxLaunchDelay", "AcceptedResourceRoles", "LastScalingAt", "LastConfigChangeAt", "IpAddress", "Residency", "PortDefinitions", "ReadinessCheckDefinition", "Secrets", "EnvVarReferences", "TaskKillGracePeriod", });
43194 internal_static_mesosphere_marathon_Json_descriptor =
43963 new java.lang.String[] { "Id", "Cmd", "Instances", "Resources", "Description", "Ports", "Constraints", "Executor", "OBSOLETEContainer", "Version", "HealthChecks", "Backoff", "BackoffFactor", "UpgradeStrategy", "Dependencies", "StoreUrls", "RequirePorts", "Container", "Labels", "MaxLaunchDelay", "AcceptedResourceRoles", "LastScalingAt", "LastConfigChangeAt", "IpAddress", "Residency", "PortDefinitions", "ReadinessCheckDefinition", "Secrets", "EnvVarReferences", "TaskKillGracePeriod", "UnreachableStrategy", });
43964 internal_static_mesosphere_marathon_UnreachableStrategy_descriptor =
4319543965 getDescriptor().getMessageTypes().get(6);
43966 internal_static_mesosphere_marathon_UnreachableStrategy_fieldAccessorTable = new
43967 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
43968 internal_static_mesosphere_marathon_UnreachableStrategy_descriptor,
43969 new java.lang.String[] { "InactiveAfterSeconds", "ExpungeAfterSeconds", });
43970 internal_static_mesosphere_marathon_Json_descriptor =
43971 getDescriptor().getMessageTypes().get(7);
4319643972 internal_static_mesosphere_marathon_Json_fieldAccessorTable = new
4319743973 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4319843974 internal_static_mesosphere_marathon_Json_descriptor,
4319943975 new java.lang.String[] { "Json", });
4320043976 internal_static_mesosphere_marathon_ResourceRoles_descriptor =
43201 getDescriptor().getMessageTypes().get(7);
43977 getDescriptor().getMessageTypes().get(8);
4320243978 internal_static_mesosphere_marathon_ResourceRoles_fieldAccessorTable = new
4320343979 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4320443980 internal_static_mesosphere_marathon_ResourceRoles_descriptor,
4320543981 new java.lang.String[] { "Role", });
4320643982 internal_static_mesosphere_marathon_MarathonTask_descriptor =
43207 getDescriptor().getMessageTypes().get(8);
43983 getDescriptor().getMessageTypes().get(9);
4320843984 internal_static_mesosphere_marathon_MarathonTask_fieldAccessorTable = new
4320943985 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4321043986 internal_static_mesosphere_marathon_MarathonTask_descriptor,
4321143987 new java.lang.String[] { "Id", "OBSOLETEHost", "Ports", "OBSOLETEAttributes", "StagedAt", "StartedAt", "OBSOLETEStatuses", "Version", "Status", "OBSOLETESlaveId", "OBSOLETENetworks", "Reservation", "Condition", });
4321243988 internal_static_mesosphere_marathon_MarathonTask_Reservation_descriptor =
4321343989 internal_static_mesosphere_marathon_MarathonTask_descriptor.getNestedTypes().get(0);
4321443990 internal_static_mesosphere_marathon_MarathonTask_Reservation_fieldAccessorTable = new
4321543991 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4321643992 internal_static_mesosphere_marathon_MarathonTask_Reservation_descriptor,
4321743993 new java.lang.String[] { "LocalVolumeIds", "State", });
4321843994 internal_static_mesosphere_marathon_MarathonTask_Reservation_State_descriptor =
4321943995 internal_static_mesosphere_marathon_MarathonTask_Reservation_descriptor.getNestedTypes().get(0);
4322043996 internal_static_mesosphere_marathon_MarathonTask_Reservation_State_fieldAccessorTable = new
4322143997 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4322243998 internal_static_mesosphere_marathon_MarathonTask_Reservation_State_descriptor,
4322343999 new java.lang.String[] { "Type", "Timeout", });
4322444000 internal_static_mesosphere_marathon_MarathonTask_Reservation_State_Timeout_descriptor =
4322544001 internal_static_mesosphere_marathon_MarathonTask_Reservation_State_descriptor.getNestedTypes().get(0);
4322644002 internal_static_mesosphere_marathon_MarathonTask_Reservation_State_Timeout_fieldAccessorTable = new
4322744003 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4322844004 internal_static_mesosphere_marathon_MarathonTask_Reservation_State_Timeout_descriptor,
4322944005 new java.lang.String[] { "Initiated", "Deadline", "Reason", });
4323044006 internal_static_mesosphere_marathon_MarathonApp_descriptor =
43231 getDescriptor().getMessageTypes().get(9);
44007 getDescriptor().getMessageTypes().get(10);
4323244008 internal_static_mesosphere_marathon_MarathonApp_fieldAccessorTable = new
4323344009 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4323444010 internal_static_mesosphere_marathon_MarathonApp_descriptor,
4323544011 new java.lang.String[] { "Name", "Tasks", });
4323644012 internal_static_mesosphere_marathon_ContainerInfo_descriptor =
43237 getDescriptor().getMessageTypes().get(10);
44013 getDescriptor().getMessageTypes().get(11);
4323844014 internal_static_mesosphere_marathon_ContainerInfo_fieldAccessorTable = new
4323944015 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4324044016 internal_static_mesosphere_marathon_ContainerInfo_descriptor,
4324144017 new java.lang.String[] { "Image", "Options", });
4324244018 internal_static_mesosphere_marathon_ExtendedContainerInfo_descriptor =
43243 getDescriptor().getMessageTypes().get(11);
44019 getDescriptor().getMessageTypes().get(12);
4324444020 internal_static_mesosphere_marathon_ExtendedContainerInfo_fieldAccessorTable = new
4324544021 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4324644022 internal_static_mesosphere_marathon_ExtendedContainerInfo_descriptor,
4324744023 new java.lang.String[] { "Type", "Volumes", "Docker", "MesosDocker", "MesosAppC", });
4324844024 internal_static_mesosphere_marathon_ExtendedContainerInfo_DockerInfo_descriptor =
4324944025 internal_static_mesosphere_marathon_ExtendedContainerInfo_descriptor.getNestedTypes().get(0);
4325044026 internal_static_mesosphere_marathon_ExtendedContainerInfo_DockerInfo_fieldAccessorTable = new
4325144027 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
Show All 13 Lines
4326544041 new java.lang.String[] { "Image", "Credential", "ForcePullImage", });
4326644042 internal_static_mesosphere_marathon_ExtendedContainerInfo_MesosAppCInfo_descriptor =
4326744043 internal_static_mesosphere_marathon_ExtendedContainerInfo_descriptor.getNestedTypes().get(2);
4326844044 internal_static_mesosphere_marathon_ExtendedContainerInfo_MesosAppCInfo_fieldAccessorTable = new
4326944045 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4327044046 internal_static_mesosphere_marathon_ExtendedContainerInfo_MesosAppCInfo_descriptor,
4327144047 new java.lang.String[] { "Image", "Id", "Labels", "ForcePullImage", });
4327244048 internal_static_mesosphere_marathon_Volume_descriptor =
43273 getDescriptor().getMessageTypes().get(12);
44049 getDescriptor().getMessageTypes().get(13);
4327444050 internal_static_mesosphere_marathon_Volume_fieldAccessorTable = new
4327544051 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4327644052 internal_static_mesosphere_marathon_Volume_descriptor,
4327744053 new java.lang.String[] { "Mode", "ContainerPath", "HostPath", "Image", "Persistent", "External", });
4327844054 internal_static_mesosphere_marathon_Volume_PersistentVolumeInfo_descriptor =
4327944055 internal_static_mesosphere_marathon_Volume_descriptor.getNestedTypes().get(0);
4328044056 internal_static_mesosphere_marathon_Volume_PersistentVolumeInfo_fieldAccessorTable = new
4328144057 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4328244058 internal_static_mesosphere_marathon_Volume_PersistentVolumeInfo_descriptor,
4328344059 new java.lang.String[] { "Size", "Type", "Constraints", "MaxSize", });
4328444060 internal_static_mesosphere_marathon_Volume_ExternalVolumeInfo_descriptor =
4328544061 internal_static_mesosphere_marathon_Volume_descriptor.getNestedTypes().get(1);
4328644062 internal_static_mesosphere_marathon_Volume_ExternalVolumeInfo_fieldAccessorTable = new
4328744063 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4328844064 internal_static_mesosphere_marathon_Volume_ExternalVolumeInfo_descriptor,
4328944065 new java.lang.String[] { "Size", "Name", "Provider", "Options", });
4329044066 internal_static_mesosphere_marathon_EventSubscribers_descriptor =
43291 getDescriptor().getMessageTypes().get(13);
44067 getDescriptor().getMessageTypes().get(14);
4329244068 internal_static_mesosphere_marathon_EventSubscribers_fieldAccessorTable = new
4329344069 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4329444070 internal_static_mesosphere_marathon_EventSubscribers_descriptor,
4329544071 new java.lang.String[] { "CallbackUrls", });
4329644072 internal_static_mesosphere_marathon_StorageVersion_descriptor =
43297 getDescriptor().getMessageTypes().get(14);
44073 getDescriptor().getMessageTypes().get(15);
4329844074 internal_static_mesosphere_marathon_StorageVersion_fieldAccessorTable = new
4329944075 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4330044076 internal_static_mesosphere_marathon_StorageVersion_descriptor,
4330144077 new java.lang.String[] { "Major", "Minor", "Patch", "Format", });
4330244078 internal_static_mesosphere_marathon_UpgradeStrategyDefinition_descriptor =
43303 getDescriptor().getMessageTypes().get(15);
44079 getDescriptor().getMessageTypes().get(16);
4330444080 internal_static_mesosphere_marathon_UpgradeStrategyDefinition_fieldAccessorTable = new
4330544081 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4330644082 internal_static_mesosphere_marathon_UpgradeStrategyDefinition_descriptor,
4330744083 new java.lang.String[] { "MinimumHealthCapacity", "MaximumOverCapacity", });
4330844084 internal_static_mesosphere_marathon_GroupDefinition_descriptor =
43309 getDescriptor().getMessageTypes().get(16);
44085 getDescriptor().getMessageTypes().get(17);
4331044086 internal_static_mesosphere_marathon_GroupDefinition_fieldAccessorTable = new
4331144087 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4331244088 internal_static_mesosphere_marathon_GroupDefinition_descriptor,
4331344089 new java.lang.String[] { "Id", "Version", "DeprecatedApps", "DeprecatedPods", "Groups", "Dependencies", "Apps", "Pods", });
4331444090 internal_static_mesosphere_marathon_GroupDefinition_AppReference_descriptor =
4331544091 internal_static_mesosphere_marathon_GroupDefinition_descriptor.getNestedTypes().get(0);
4331644092 internal_static_mesosphere_marathon_GroupDefinition_AppReference_fieldAccessorTable = new
4331744093 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4331844094 internal_static_mesosphere_marathon_GroupDefinition_AppReference_descriptor,
4331944095 new java.lang.String[] { "Id", "Version", });
4332044096 internal_static_mesosphere_marathon_DeploymentPlanDefinition_descriptor =
43321 getDescriptor().getMessageTypes().get(17);
44097 getDescriptor().getMessageTypes().get(18);
4332244098 internal_static_mesosphere_marathon_DeploymentPlanDefinition_fieldAccessorTable = new
4332344099 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4332444100 internal_static_mesosphere_marathon_DeploymentPlanDefinition_descriptor,
4332544101 new java.lang.String[] { "Id", "Timestamp", "DeprecatedOriginal", "DeprecatedTarget", "OriginalRootVersion", "TargetRootVersion", });
4332644102 internal_static_mesosphere_marathon_TaskFailure_descriptor =
43327 getDescriptor().getMessageTypes().get(18);
44103 getDescriptor().getMessageTypes().get(19);
4332844104 internal_static_mesosphere_marathon_TaskFailure_fieldAccessorTable = new
4332944105 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4333044106 internal_static_mesosphere_marathon_TaskFailure_descriptor,
4333144107 new java.lang.String[] { "AppId", "TaskId", "State", "Message", "Host", "Version", "Timestamp", "SlaveId", });
4333244108 internal_static_mesosphere_marathon_ZKStoreEntry_descriptor =
43333 getDescriptor().getMessageTypes().get(19);
44109 getDescriptor().getMessageTypes().get(20);
4333444110 internal_static_mesosphere_marathon_ZKStoreEntry_fieldAccessorTable = new
4333544111 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4333644112 internal_static_mesosphere_marathon_ZKStoreEntry_descriptor,
4333744113 new java.lang.String[] { "Name", "Uuid", "Value", "Compressed", });
4333844114 internal_static_mesosphere_marathon_ResidencyDefinition_descriptor =
43339 getDescriptor().getMessageTypes().get(20);
44115 getDescriptor().getMessageTypes().get(21);
4334044116 internal_static_mesosphere_marathon_ResidencyDefinition_fieldAccessorTable = new
4334144117 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4334244118 internal_static_mesosphere_marathon_ResidencyDefinition_descriptor,
4334344119 new java.lang.String[] { "RelaunchEscalationTimeoutSeconds", "TaskLostBehavior", });
4334444120 internal_static_mesosphere_marathon_Secret_descriptor =
43345 getDescriptor().getMessageTypes().get(21);
44121 getDescriptor().getMessageTypes().get(22);
4334644122 internal_static_mesosphere_marathon_Secret_fieldAccessorTable = new
4334744123 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4334844124 internal_static_mesosphere_marathon_Secret_descriptor,
4334944125 new java.lang.String[] { "Id", "Source", });
4335044126 internal_static_mesosphere_marathon_EnvVarReference_descriptor =
43351 getDescriptor().getMessageTypes().get(22);
44127 getDescriptor().getMessageTypes().get(23);
4335244128 internal_static_mesosphere_marathon_EnvVarReference_fieldAccessorTable = new
4335344129 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4335444130 internal_static_mesosphere_marathon_EnvVarReference_descriptor,
4335544131 new java.lang.String[] { "Type", "Name", "SecretRef", });
4335644132 internal_static_mesosphere_marathon_EnvVarSecretRef_descriptor =
43357 getDescriptor().getMessageTypes().get(23);
44133 getDescriptor().getMessageTypes().get(24);
4335844134 internal_static_mesosphere_marathon_EnvVarSecretRef_fieldAccessorTable = new
4335944135 com.google.protobuf.GeneratedMessage.FieldAccessorTable(
4336044136 internal_static_mesosphere_marathon_EnvVarSecretRef_descriptor,
4336144137 new java.lang.String[] { "SecretId", });
4336244138 return null;
4336344139 }
4336444140 };
4336544141 com.google.protobuf.Descriptors.FileDescriptor
4336644142 .internalBuildGeneratedFileFrom(descriptorData,
4336744143 new com.google.protobuf.Descriptors.FileDescriptor[] {
4336844144 org.apache.mesos.Protos.getDescriptor(),
4336944145 }, assigner);
4337044146 }
4337144147
4337244148 // @@protoc_insertion_point(outer_class_scope)
4337344149}
View Options

src/main/proto/marathon.proto

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Line(s)
109109 optional int64 last_config_change_at = 24;
110110 optional IpAddress ipAddress = 25;
111111 optional ResidencyDefinition residency = 26;
112112 repeated mesos.Port portDefinitions = 27;
113113 repeated ReadinessCheckDefinition readinessCheckDefinition = 28;
114114 repeated Secret secrets = 29;
115115 repeated EnvVarReference envVarReferences = 30;
116116 optional int64 taskKillGracePeriod = 31; // stored as Millis
117 optional UnreachableStrategy unreachableStrategy = 32;
jdefUnsubmitted
Not Done

interesting that I don't see killSelection in here. @jeschkies ?

118}
119
120message UnreachableStrategy {
121 required uint64 inactiveAfterSeconds = 1 [default = 900 ]; // 15 minutes
122 required uint64 expungeAfterSeconds = 2 [default = 604800 ]; // 7 days
117123}
118124
119125// we serialize PodDefinition and Instances as json, only required for legacy content
120126message Json {
121127 required string json = 1;
122128}
123129
124130message ResourceRoles {
▲ Show 20 Lines • Show All 309 Lines • Show Last 20 Lines
View Options

src/main/scala/mesosphere/marathon/api/v2/json/AppUpdate.scala

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Line(s)
7070 acceptedResourceRoles: Option[Set[String]] = None,
7171
7272 version: Option[Timestamp] = None,
7373
7474 ipAddress: Option[IpAddress] = None,
7575
7676 residency: Option[Residency] = None,
7777
78 secrets: Option[Map[String, Secret]] = None) {
78 secrets: Option[Map[String, Secret]] = None,
7979
80 unreachableStrategy: Option[UnreachableStrategy] = None) {
81
8082 require(version.isEmpty || onlyVersionOrIdSet, "The 'version' field may only be combined with the 'id' field.")
8183
8284 protected[api] def onlyVersionOrIdSet: Boolean = productIterator forall {
8385 case x: Some[Any] => x == version || x == id // linter:ignore UnlikelyEquality
8486 case _ => true
8587 }
8688
8789 def isResident: Boolean = residency.isDefined
▲ Show 20 Lines • Show All 53 Lines • ▼ Show 20 Line(s)
141143 // The versionInfo may never be overridden by an AppUpdate.
142144 // Setting the version in AppUpdate means that the user wants to revert to that version. In that
143145 // case, we do not update the current AppDefinition but revert completely to the specified version.
144146 // For all other updates, the GroupVersioningUtil will determine a new version if the AppDefinition
145147 // has really changed.
146148 versionInfo = app.versionInfo,
147149 residency = residency.orElse(app.residency),
148150 secrets = secrets.getOrElse(app.secrets),
149 taskKillGracePeriod = taskKillGracePeriod.orElse(app.taskKillGracePeriod)
151 taskKillGracePeriod = taskKillGracePeriod.orElse(app.taskKillGracePeriod),
152 unreachableStrategy = unreachableStrategy.getOrElse(app.unreachableStrategy)
150153 )
151154
152155 def withCanonizedIds(base: PathId = PathId.empty): AppUpdate = copy(
153156 id = id.map(_.canonicalPath(base)),
154157 dependencies = dependencies.map(_.map(_.canonicalPath(base)))
155158 )
156159}
157160
Show All 12 Lines
170173 appUp.cpus should optional(be >= 0.0)
171174 appUp.instances should optional(be >= 0)
172175 appUp.disk should optional(be >= 0.0)
173176 appUp.gpus should optional(be >= 0)
174177 appUp.env is optional(valid(EnvVarValue.envValidator))
175178 appUp.secrets is optional(valid(Secret.secretsValidator))
176179 appUp.secrets is optional(empty) or featureEnabled(enabledFeatures, Features.SECRETS)
177180 appUp.acceptedResourceRoles is optional(ResourceRole.validAcceptedResourceRoles(appUp.isResident))
181 appUp.unreachableStrategy is optional(valid)
jdefUnsubmitted
Done

optional(valid) ?

178182 }
179183}
View Options

src/main/scala/mesosphere/marathon/api/v2/json/Formats.scala

Show First 20 Lines • Show All 1063 Lines • ▼ Show 20 Line(s)
10641064 labels = extra.labels,
10651065 acceptedResourceRoles = extra.acceptedResourceRoles,
10661066 ipAddress = extra.ipAddress,
10671067 versionInfo = VersionInfo.OnlyVersion(extra.version),
10681068 residency = extra.residencyOrDefault,
10691069 readinessChecks = extra.readinessChecks,
10701070 secrets = extra.secrets,
10711071 taskKillGracePeriod = extra.maybeTaskKillGracePeriod,
1072 unreachableStrategy = extra.unreachableStrategy.fold(state.UnreachableStrategy())(Raml.fromRaml(_)),
1072 unreachableStrategy = extra.unreachableStrategy.fold(state.UnreachableStrategy.default)(Raml.fromRaml(_)),
10731073 killSelection = extra.killSelection.fold(state.KillSelection.DefaultKillSelection)(Raml.fromRaml(_))
10741074 )
10751075 }
10761076 }
10771077 }.map(addHealthCheckPortIndexIfNecessary)
10781078
10791079 /**
10801080 * Ensure backwards compatibility by adding portIndex to health checks when necessary.
▲ Show 20 Lines • Show All 254 Lines • ▼ Show 20 Line(s)
13351335 (__ \ "constraints").readNullable[Set[Constraint]] ~
13361336 (__ \ "storeUrls").readNullable[Seq[String]] ~
13371337 (__ \ "requirePorts").readNullable[Boolean] ~
13381338 (__ \ "backoffSeconds").readNullable[Long].map(_.map(_.seconds)) ~
13391339 (__ \ "backoffFactor").readNullable[Double] ~
13401340 (__ \ "maxLaunchDelaySeconds").readNullable[Long].map(_.map(_.seconds)) ~
13411341 (__ \ "container").readNullable[Container] ~
13421342 (__ \ "healthChecks").readNullable[Set[HealthCheck]] ~
1343 (__ \ "dependencies").readNullable[Set[PathId]]
1343 (__ \ "dependencies").readNullable[Set[PathId]] ~
1344 (__ \ "unreachableStrategy").readNullable[UnreachableStrategy]
1345
13441346 ) ((id, cmd, args, user, env, instances, cpus, mem, disk, gpus, executor, constraints, storeUrls, requirePorts,
1345 backoffSeconds, backoffFactor, maxLaunchDelaySeconds, container, healthChecks, dependencies) =>
1347 backoffSeconds, backoffFactor, maxLaunchDelaySeconds, container, healthChecks, dependencies, unreachableStrategy) =>
13461348 AppUpdate(
13471349 id = id, cmd = cmd, args = args, user = user, env = env, instances = instances, cpus = cpus, mem = mem,
13481350 disk = disk, gpus = gpus, executor = executor, constraints = constraints,
13491351 storeUrls = storeUrls, requirePorts = requirePorts,
13501352 backoff = backoffSeconds, backoffFactor = backoffFactor, maxLaunchDelay = maxLaunchDelaySeconds,
1351 container = container, healthChecks = healthChecks, dependencies = dependencies
1353 container = container, healthChecks = healthChecks, dependencies = dependencies,
1354 unreachableStrategy = unreachableStrategy.map(Raml.fromRaml(_))
13521355 )
13531356 ).flatMap { update =>
13541357 // necessary because of case class limitations (good for another 21 fields)
13551358 case class ExtraFields(
13561359 uris: Option[Seq[String]],
13571360 fetch: Option[Seq[FetchUri]],
13581361 upgradeStrategy: Option[UpgradeStrategy],
13591362 labels: Option[Map[String, String]],
▲ Show 20 Lines • Show All 105 Lines • Show Last 20 Lines
View Options

src/main/scala/mesosphere/marathon/core/instance/Instance.scala

Show All 23 Lines
2424
2525// TODO: remove MarathonState stuff once legacy persistence is gone
2626case class Instance(
2727 instanceId: Instance.Id,
2828 agentInfo: Instance.AgentInfo,
2929 state: InstanceState,
3030 tasksMap: Map[Task.Id, Task],
3131 runSpecVersion: Timestamp,
32 unreachableStrategy: UnreachableStrategy = UnreachableStrategy()) extends MarathonState[Protos.Json, Instance]
32 unreachableStrategy: UnreachableStrategy = UnreachableStrategy.default) extends MarathonState[Protos.Json, Instance]
3333 with Placed with StrictLogging {
3434
3535 val runSpecId: PathId = instanceId.runSpecId
3636 val isLaunched: Boolean = state.condition.isActive
3737
3838 def isReserved: Boolean = state.condition == Condition.Reserved
3939 def isCreated: Boolean = state.condition == Condition.Created
4040 def isError: Boolean = state.condition == Condition.Error
▲ Show 20 Lines • Show All 450 Lines • Show Last 20 Lines
View Options

src/main/scala/mesosphere/marathon/core/pod/PodDefinition.scala

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 Line(s)
114114 val DefaultInstances = 1
115115 val DefaultMaxInstances = Option.empty[Int]
116116 val DefaultConstraints = Set.empty[Protos.Constraint]
117117 val DefaultVersion = Timestamp.now()
118118 val DefaultVolumes = Seq.empty[Volume]
119119 val DefaultNetworks = Seq.empty[Network]
120120 val DefaultBackoffStrategy = BackoffStrategy()
121121 val DefaultUpgradeStrategy = AppDefinition.DefaultUpgradeStrategy
122 val DefaultUnreachableStrategy = UnreachableStrategy()
122 val DefaultUnreachableStrategy = UnreachableStrategy.default
123123
124124}
View Options

src/main/scala/mesosphere/marathon/state/AppDefinition.scala

Show First 20 Lines • Show All 140 Lines • ▼ Show 20 Line(s)
141141 .addResources(gpusResource)
142142 .addAllHealthChecks(healthChecks.map(_.toProto)(collection.breakOut))
143143 .setUpgradeStrategy(upgradeStrategy.toProto)
144144 .addAllDependencies(dependencies.map(_.toString))
145145 .addAllStoreUrls(storeUrls)
146146 .addAllLabels(appLabels)
147147 .addAllSecrets(secrets.map(SecretsSerializer.toProto))
148148 .addAllEnvVarReferences(env.flatMap(EnvVarRefSerializer.toProto))
149 .setUnreachableStrategy(unreachableStrategy.toProto)
jdefUnsubmitted
Not Done

also don't see killSelection here @jeschkies

149150
150151 ipAddress.foreach { ip => builder.setIpAddress(ip.toProto) }
151152 container.foreach { c => builder.setContainer(ContainerSerializer.toProto(c)) }
152153 readinessChecks.foreach { r => builder.addReadinessCheckDefinition(ReadinessCheckSerializer.toProto(r)) }
153154 taskKillGracePeriod.foreach { t => builder.setTaskKillGracePeriod(t.toMillis) }
154155
155156 if (acceptedResourceRoles.nonEmpty) {
156157 val roles = Protos.ResourceRoles.newBuilder()
▲ Show 20 Lines • Show All 57 Lines • ▼ Show 20 Line(s)
214215 val residencyOption = if (proto.hasResidency) Some(ResidencySerializer.fromProto(proto.getResidency)) else None
215216
216217 // TODO (gkleiman): we have to be able to read the ports from the deprecated field in order to perform migrations
217218 // until the deprecation cycle is complete.
218219 val portDefinitions =
219220 if (proto.getPortsCount > 0) PortDefinitions(proto.getPortsList.map(_.intValue)(collection.breakOut): _*)
220221 else proto.getPortDefinitionsList.map(PortDefinitionSerializer.fromProto).to[Seq]
221222
223 val unreachableStrategy = if (proto.hasUnreachableStrategy) UnreachableStrategy.fromProto(proto.getUnreachableStrategy) else UnreachableStrategy.default
224
222225 AppDefinition(
223226 id = PathId(proto.getId),
224227 user = if (proto.getCmd.hasUser) Some(proto.getCmd.getUser) else None,
225228 cmd = commandOption,
226229 args = argsOption,
227230 executor = proto.getExecutor,
228231 instances = proto.getInstances,
229232 portDefinitions = portDefinitions,
Show All 22 Lines
252255 labels = proto.getLabelsList.map { p => p.getKey -> p.getValue }(collection.breakOut),
253256 versionInfo = versionInfoFromProto,
254257 upgradeStrategy =
255258 if (proto.hasUpgradeStrategy) UpgradeStrategy.fromProto(proto.getUpgradeStrategy)
256259 else UpgradeStrategy.empty,
257260 dependencies = proto.getDependenciesList.map(PathId(_))(collection.breakOut),
258261 ipAddress = ipAddressOption,
259262 residency = residencyOption,
260 secrets = proto.getSecretsList.map(SecretsSerializer.fromProto)(collection.breakOut)
263 secrets = proto.getSecretsList.map(SecretsSerializer.fromProto)(collection.breakOut),
264 unreachableStrategy = unreachableStrategy
261265 )
262266 }
263267
264268 val hostPorts: Seq[Option[Int]] =
265269 container.withFilter(_.portMappings.nonEmpty).map(_.hostPorts).getOrElse(portNumbers.map(Some(_)))
266270
267271 val servicePorts: Seq[Int] =
268272 container.withFilter(_.portMappings.nonEmpty).map(_.servicePorts).getOrElse(portNumbers)
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Line(s)
311315 taskKillGracePeriod != to.taskKillGracePeriod ||
312316 dependencies != to.dependencies ||
313317 upgradeStrategy != to.upgradeStrategy ||
314318 labels != to.labels ||
315319 acceptedResourceRoles != to.acceptedResourceRoles ||
316320 ipAddress != to.ipAddress ||
317321 readinessChecks != to.readinessChecks ||
318322 residency != to.residency ||
319 secrets != to.secrets
323 secrets != to.secrets ||
324 unreachableStrategy != to.unreachableStrategy
320325 }
321326 case _ =>
322327 // A validation rule will ensure, this can not happen
323328 throw new IllegalStateException("Can't change app to pod")
324329 }
325330
326331 /**
327332 * Returns the changed app definition that is marked for restarting.
▲ Show 20 Lines • Show All 86 Lines • ▼ Show 20 Line(s)
414419 val DefaultTaskKillGracePeriod = Option.empty[FiniteDuration]
415420
416421 val DefaultDependencies = Set.empty[PathId]
417422
418423 val DefaultUpgradeStrategy: UpgradeStrategy = UpgradeStrategy.empty
419424
420425 val DefaultSecrets = Map.empty[String, Secret]
421426
422 val DefaultUnreachableStrategy = UnreachableStrategy()
427 val DefaultUnreachableStrategy = UnreachableStrategy.default
423428
424429 object Labels {
425430 val Default = Map.empty[String, String]
426431
427432 val DcosMigrationApiPath = "DCOS_MIGRATION_API_PATH"
428433 val DcosMigrationApiVersion = "DCOS_MIGRATION_API_VERSION"
429434 val DcosPackageFrameworkName = "DCOS_PACKAGE_FRAMEWORK_NAME"
430435 val SingleInstanceApp = "MARATHON_SINGLE_INSTANCE_APP"
▲ Show 20 Lines • Show All 264 Lines • Show Last 20 Lines
View Options

src/main/scala/mesosphere/marathon/state/UnreachableStrategy.scala

11package mesosphere.marathon
22package state
33
44import com.wix.accord.dsl._
55
66import scala.concurrent.duration._
7import mesosphere.marathon.Protos
78
89/**
910 * Defines the time outs for unreachable tasks.
1011 */
1112case class UnreachableStrategy(
1213 inactiveAfter: FiniteDuration = UnreachableStrategy.DefaultInactiveAfter,
13 expungeAfter: FiniteDuration = UnreachableStrategy.DefaultExpungeAfter)
14 expungeAfter: FiniteDuration = UnreachableStrategy.DefaultExpungeAfter) {
1415
16 def toProto: Protos.UnreachableStrategy =
17 Protos.UnreachableStrategy.newBuilder.
18 setExpungeAfterSeconds(expungeAfter.toSeconds).
19 setInactiveAfterSeconds(inactiveAfter.toSeconds).
20 build
21}
22
1523object UnreachableStrategy {
1624 val DefaultInactiveAfter: FiniteDuration = 15.minutes
1725 val DefaultExpungeAfter: FiniteDuration = 7.days
26 val default = UnreachableStrategy()
1827
1928 implicit val unreachableStrategyValidator = validator[UnreachableStrategy] { strategy =>
2029 strategy.inactiveAfter should be >= 1.second
2130 strategy.inactiveAfter should be < strategy.expungeAfter
31 }
32
33 def fromProto(unreachableStrategyProto: Protos.UnreachableStrategy): UnreachableStrategy = {
34 UnreachableStrategy(
35 inactiveAfter = unreachableStrategyProto.getInactiveAfterSeconds.seconds,
36 expungeAfter = unreachableStrategyProto.getExpungeAfterSeconds.seconds)
2237 }
2338}
View Options

src/test/scala/mesosphere/marathon/api/v2/json/AppDefinitionFormatsTest.scala

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Line(s)
123123 r1.backoffStrategy.maxLaunchDelay should equal (DefaultMaxLaunchDelay)
124124 r1.container should equal (DefaultContainer)
125125 r1.healthChecks should equal (DefaultHealthChecks)
126126 r1.dependencies should equal (DefaultDependencies)
127127 r1.upgradeStrategy should equal (DefaultUpgradeStrategy)
128128 r1.acceptedResourceRoles should be ('empty)
129129 r1.secrets should equal (DefaultSecrets)
130130 r1.taskKillGracePeriod should equal (DefaultTaskKillGracePeriod)
131 r1.unreachableStrategy should equal (DefaultUnreachableStrategy)
131132 }
132133
133134 test("FromJSON should ignore VersionInfo") {
134135 val app = Json.parse(
135136 """{
136137 | "id": "test",
137138 | "version": "1970-01-01T00:00:00.002Z",
138139 | "versionInfo": {
▲ Show 20 Lines • Show All 361 Lines • Show Last 20 Lines
View Options

src/test/scala/mesosphere/marathon/api/v2/json/AppUpdateTest.scala

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Line(s)
138138 groups = Seq("a", "b", "c"),
139139 labels = Map(
140140 "foo" -> "bar",
141141 "baz" -> "buzz"
142142 ),
143143 discoveryInfo = DiscoveryInfo(
144144 ports = Seq(Port(name = "http", number = 80, protocol = "tcp"))
145145 )
146 ))
146 )),
147 unreachableStrategy = Some(UnreachableStrategy(998.seconds, 999.seconds))
147148 )
148149 JsonTestHelper.assertSerializationRoundtripWorks(update1)
149150 }
150151
151152 test("Serialization result of empty container") {
152153 val update2 = AppUpdate(container = None)
153154 val json2 =
154155 """
▲ Show 20 Lines • Show All 426 Lines • Show Last 20 Lines
View Options

src/test/scala/mesosphere/marathon/integration/setup/V2TestFormats.scala

11package mesosphere.marathon.integration.setup
22
33import mesosphere.marathon.api.v2.json.AppUpdate
44import mesosphere.marathon.core.event._
55import mesosphere.marathon.state.{ Group, RootGroup, Timestamp }
66import mesosphere.marathon.upgrade.DeploymentPlan
7import mesosphere.marathon.raml.Raml
78import play.api.libs.json._
89
910/**
1011 * Formats for JSON objects which do not need write support in the production code.
1112 */
1213object V2TestFormats {
1314 import mesosphere.marathon.api.v2.json.Formats._
1415
▲ Show 20 Lines • Show All 57 Lines • ▼ Show 20 Line(s)
7273 "healthChecks" -> update.healthChecks.map(_.map(Json.toJson(_)(HealthCheckFormat))),
7374 "readinessChecks" -> update.readinessChecks,
7475 "taskKillGracePeriodSeconds" -> update.taskKillGracePeriod.map(_.toSeconds),
7576 "dependencies" -> update.dependencies,
7677 "upgradeStrategy" -> update.upgradeStrategy,
7778 "labels" -> update.labels,
7879 "version" -> update.version,
7980 "acceptedResourceRoles" -> update.acceptedResourceRoles,
80 "ipAddress" -> update.ipAddress
81 "ipAddress" -> update.ipAddress,
82 "unreachableStrategy" -> Raml.toRaml(update.unreachableStrategy)
8183 )
8284 }
8385}
View Options

src/test/scala/mesosphere/marathon/state/AppDefinitionTest.scala

11package mesosphere.marathon
22package state
33
44import mesosphere.marathon.Protos.ServiceDefinition
55import mesosphere.marathon.raml.Resources
66import mesosphere.marathon.state.EnvVarValue._
77import mesosphere.marathon.state.PathId._
88import mesosphere.marathon.stream._
99import mesosphere.marathon.test.MarathonSpec
1010import org.apache.mesos.{ Protos => mesos }
1111import org.scalatest.Matchers
12import scala.concurrent.duration._
1213
1314class AppDefinitionTest extends MarathonSpec with Matchers {
1415
1516 val fullVersion = VersionInfo.forNewConfig(Timestamp(1))
1617 val runSpecId = PathId("/test")
1718
1819 test("ToProto with port definitions") {
1920 val app1 = AppDefinition(
▲ Show 20 Lines • Show All 241 Lines • ▼ Show 20 Line(s)
261262 instances = 5,
262263 portDefinitions = PortDefinitions(8080, 8081),
263264 executor = "//cmd",
264265 labels = Map(
265266 "one" -> "aaa",
266267 "two" -> "bbb",
267268 "three" -> "ccc"
268269 ),
269 versionInfo = fullVersion
270 versionInfo = fullVersion,
271 unreachableStrategy = UnreachableStrategy(998.seconds, 999.seconds)
270272 )
271273 val result1 = AppDefinition(id = runSpecId).mergeFromProto(app1.toProto)
272274 assert(result1 == app1)
273275
274276 val app2 = AppDefinition(
275277 id = runSpecId,
276278 cmd = None,
277279 args = Seq("a", "b", "c"),
Show All 29 Lines