Repository: incubator-slider Updated Branches: refs/heads/develop 9318aea87 -> ebc216a7e
SLIDER-837 Test failures - TestStandaloneYarnRegistryAM and TestStandaloneAgentAM Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ebc216a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ebc216a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ebc216a7 Branch: refs/heads/develop Commit: ebc216a7e6e685a4232c80303c5d23670e6d9e17 Parents: 9318aea Author: Gour Saha <[email protected]> Authored: Wed Apr 1 20:24:58 2015 -0700 Committer: Gour Saha <[email protected]> Committed: Wed Apr 1 20:25:58 2015 -0700 ---------------------------------------------------------------------- .../org/apache/slider/api/proto/Messages.java | 40 ++++++++------------ .../server/appmaster/state/RoleInstance.java | 4 +- .../src/main/proto/SliderClusterMessages.proto | 2 +- 3 files changed, 20 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ebc216a7/slider-core/src/main/java/org/apache/slider/api/proto/Messages.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/api/proto/Messages.java b/slider-core/src/main/java/org/apache/slider/api/proto/Messages.java index 845f498..e3d8117 100644 --- a/slider-core/src/main/java/org/apache/slider/api/proto/Messages.java +++ b/slider-core/src/main/java/org/apache/slider/api/proto/Messages.java @@ -201,17 +201,17 @@ public final class Messages { com.google.protobuf.ByteString getHostURLBytes(); - // required string appVersion = 16; + // optional string appVersion = 16; /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ boolean hasAppVersion(); /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ java.lang.String getAppVersion(); /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ com.google.protobuf.ByteString getAppVersionBytes(); @@ -808,17 +808,17 @@ public final class Messages { } } - // required string appVersion = 16; + // optional string appVersion = 16; public static final int APPVERSION_FIELD_NUMBER = 16; private java.lang.Object appVersion_; /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ public boolean hasAppVersion() { return ((bitField0_ & 0x00001000) == 0x00001000); } /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ public java.lang.String getAppVersion() { java.lang.Object ref = appVersion_; @@ -835,7 +835,7 @@ public final class Messages { } } /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ public com.google.protobuf.ByteString getAppVersionBytes() { @@ -909,10 +909,6 @@ public final class Messages { memoizedIsInitialized = 0; return false; } - if (!hasAppVersion()) { - memoizedIsInitialized = 0; - return false; - } memoizedIsInitialized = 1; return true; } @@ -1570,10 +1566,6 @@ public final class Messages { return false; } - if (!hasAppVersion()) { - - return false; - } return true; } @@ -2424,16 +2416,16 @@ public final class Messages { return this; } - // required string appVersion = 16; + // optional string appVersion = 16; private java.lang.Object appVersion_ = ""; /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ public boolean hasAppVersion() { return ((bitField0_ & 0x00004000) == 0x00004000); } /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ public java.lang.String getAppVersion() { java.lang.Object ref = appVersion_; @@ -2447,7 +2439,7 @@ public final class Messages { } } /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ public com.google.protobuf.ByteString getAppVersionBytes() { @@ -2463,7 +2455,7 @@ public final class Messages { } } /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ public Builder setAppVersion( java.lang.String value) { @@ -2476,7 +2468,7 @@ public final class Messages { return this; } /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ public Builder clearAppVersion() { bitField0_ = (bitField0_ & ~0x00004000); @@ -2485,7 +2477,7 @@ public final class Messages { return this; } /** - * <code>required string appVersion = 16;</code> + * <code>optional string appVersion = 16;</code> */ public Builder setAppVersionBytes( com.google.protobuf.ByteString value) { @@ -27337,7 +27329,7 @@ public final class Messages { "ment\030\t \003(\t\022\016\n\006roleId\030\n \002(\r\022\020\n\010released\030\013" + " \002(\010\022\022\n\ncreateTime\030\014 \002(\003\022\021\n\tstartTime\030\r " + "\002(\003\022\014\n\004host\030\016 \002(\t\022\017\n\007hostURL\030\017 \002(\t\022\022\n\nap" + - "pVersion\030\020 \002(\t\"*\n\027StopClusterRequestProt" + + "pVersion\030\020 \001(\t\"*\n\027StopClusterRequestProt" + "o\022\017\n\007message\030\001 \002(\t\"\032\n\030StopClusterRespons", "eProto\".\n\027FlexClusterRequestProto\022\023\n\013clu" + "sterSpec\030\001 \002(\t\",\n\030FlexClusterResponsePro" + http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ebc216a7/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleInstance.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleInstance.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleInstance.java index 4b7cfb6..30a2bb0 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleInstance.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleInstance.java @@ -205,7 +205,9 @@ public final class RoleInstance implements Cloneable { builder.setStartTime(startTime); builder.setHost(host); builder.setHostURL(hostURL); - builder.setAppVersion(appVersion); + if (appVersion != null) { + builder.setAppVersion(appVersion); + } return builder.build(); } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ebc216a7/slider-core/src/main/proto/SliderClusterMessages.proto ---------------------------------------------------------------------- diff --git a/slider-core/src/main/proto/SliderClusterMessages.proto b/slider-core/src/main/proto/SliderClusterMessages.proto index c0350e5..c2eba89 100644 --- a/slider-core/src/main/proto/SliderClusterMessages.proto +++ b/slider-core/src/main/proto/SliderClusterMessages.proto @@ -39,7 +39,7 @@ message RoleInstanceState { required int64 startTime = 13; required string host = 14; required string hostURL = 15; - required string appVersion = 16; + optional string appVersion = 16; } /**
