diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java
index e61c65e999..a862ced918 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java
@@ -15,6 +15,7 @@ public final class InitialLoadBalanceResponse extends
super(builder);
}
private InitialLoadBalanceResponse() {
+ loadBalancerDelegate_ = "";
}
@java.lang.Override
@@ -42,13 +43,13 @@ public final class InitialLoadBalanceResponse extends
}
break;
}
- case 18: {
+ case 10: {
java.lang.String s = input.readStringRequireUtf8();
- initialResponseTypeCase_ = 2;
- initialResponseType_ = s;
+
+ loadBalancerDelegate_ = s;
break;
}
- case 26: {
+ case 18: {
com.google.protobuf.Duration.Builder subBuilder = null;
if (clientStatsReportInterval_ != null) {
subBuilder = clientStatsReportInterval_.toBuilder();
@@ -84,100 +85,55 @@ public final class InitialLoadBalanceResponse extends
io.grpc.grpclb.InitialLoadBalanceResponse.class, io.grpc.grpclb.InitialLoadBalanceResponse.Builder.class);
}
- private int initialResponseTypeCase_ = 0;
- private java.lang.Object initialResponseType_;
- public enum InitialResponseTypeCase
- implements com.google.protobuf.Internal.EnumLite {
- LOAD_BALANCER_DELEGATE(2),
- INITIALRESPONSETYPE_NOT_SET(0);
- private final int value;
- private InitialResponseTypeCase(int value) {
- this.value = value;
- }
- /**
- * @deprecated Use {@link #forNumber(int)} instead.
- */
- @java.lang.Deprecated
- public static InitialResponseTypeCase valueOf(int value) {
- return forNumber(value);
- }
-
- public static InitialResponseTypeCase forNumber(int value) {
- switch (value) {
- case 2: return LOAD_BALANCER_DELEGATE;
- case 0: return INITIALRESPONSETYPE_NOT_SET;
- default: return null;
- }
- }
- public int getNumber() {
- return this.value;
- }
- };
-
- public InitialResponseTypeCase
- getInitialResponseTypeCase() {
- return InitialResponseTypeCase.forNumber(
- initialResponseTypeCase_);
- }
-
- public static final int LOAD_BALANCER_DELEGATE_FIELD_NUMBER = 2;
+ public static final int LOAD_BALANCER_DELEGATE_FIELD_NUMBER = 1;
+ private volatile java.lang.Object loadBalancerDelegate_;
/**
*
- * This is an application layer redirect that indicates the client should
- * use the specified server for load balancing. When this field is set in
+ * This is an application layer redirect that indicates the client should use
+ * the specified server for load balancing. When this field is non-empty in
* the response, the client should open a separate connection to the
* load_balancer_delegate and call the BalanceLoad method.
*
*
- * optional string load_balancer_delegate = 2;
+ * optional string load_balancer_delegate = 1;
*/
public java.lang.String getLoadBalancerDelegate() {
- java.lang.Object ref = "";
- if (initialResponseTypeCase_ == 2) {
- ref = initialResponseType_;
- }
+ java.lang.Object ref = loadBalancerDelegate_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
- if (initialResponseTypeCase_ == 2) {
- initialResponseType_ = s;
- }
+ loadBalancerDelegate_ = s;
return s;
}
}
/**
*
- * This is an application layer redirect that indicates the client should
- * use the specified server for load balancing. When this field is set in
+ * This is an application layer redirect that indicates the client should use
+ * the specified server for load balancing. When this field is non-empty in
* the response, the client should open a separate connection to the
* load_balancer_delegate and call the BalanceLoad method.
*
*
- * optional string load_balancer_delegate = 2;
+ * optional string load_balancer_delegate = 1;
*/
public com.google.protobuf.ByteString
getLoadBalancerDelegateBytes() {
- java.lang.Object ref = "";
- if (initialResponseTypeCase_ == 2) {
- ref = initialResponseType_;
- }
+ java.lang.Object ref = loadBalancerDelegate_;
if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
- if (initialResponseTypeCase_ == 2) {
- initialResponseType_ = b;
- }
+ loadBalancerDelegate_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
- public static final int CLIENT_STATS_REPORT_INTERVAL_FIELD_NUMBER = 3;
+ public static final int CLIENT_STATS_REPORT_INTERVAL_FIELD_NUMBER = 2;
private com.google.protobuf.Duration clientStatsReportInterval_;
/**
*
@@ -186,7 +142,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
public boolean hasClientStatsReportInterval() {
return clientStatsReportInterval_ != null;
@@ -198,7 +154,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
public com.google.protobuf.Duration getClientStatsReportInterval() {
return clientStatsReportInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : clientStatsReportInterval_;
@@ -210,7 +166,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
public com.google.protobuf.DurationOrBuilder getClientStatsReportIntervalOrBuilder() {
return getClientStatsReportInterval();
@@ -228,11 +184,11 @@ public final class InitialLoadBalanceResponse extends
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- if (initialResponseTypeCase_ == 2) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 2, initialResponseType_);
+ if (!getLoadBalancerDelegateBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, loadBalancerDelegate_);
}
if (clientStatsReportInterval_ != null) {
- output.writeMessage(3, getClientStatsReportInterval());
+ output.writeMessage(2, getClientStatsReportInterval());
}
}
@@ -241,12 +197,12 @@ public final class InitialLoadBalanceResponse extends
if (size != -1) return size;
size = 0;
- if (initialResponseTypeCase_ == 2) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, initialResponseType_);
+ if (!getLoadBalancerDelegateBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, loadBalancerDelegate_);
}
if (clientStatsReportInterval_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(3, getClientStatsReportInterval());
+ .computeMessageSize(2, getClientStatsReportInterval());
}
memoizedSize = size;
return size;
@@ -264,22 +220,13 @@ public final class InitialLoadBalanceResponse extends
io.grpc.grpclb.InitialLoadBalanceResponse other = (io.grpc.grpclb.InitialLoadBalanceResponse) obj;
boolean result = true;
+ result = result && getLoadBalancerDelegate()
+ .equals(other.getLoadBalancerDelegate());
result = result && (hasClientStatsReportInterval() == other.hasClientStatsReportInterval());
if (hasClientStatsReportInterval()) {
result = result && getClientStatsReportInterval()
.equals(other.getClientStatsReportInterval());
}
- result = result && getInitialResponseTypeCase().equals(
- other.getInitialResponseTypeCase());
- if (!result) return false;
- switch (initialResponseTypeCase_) {
- case 2:
- result = result && getLoadBalancerDelegate()
- .equals(other.getLoadBalancerDelegate());
- break;
- case 0:
- default:
- }
return result;
}
@@ -290,18 +237,12 @@ public final class InitialLoadBalanceResponse extends
}
int hash = 41;
hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (37 * hash) + LOAD_BALANCER_DELEGATE_FIELD_NUMBER;
+ hash = (53 * hash) + getLoadBalancerDelegate().hashCode();
if (hasClientStatsReportInterval()) {
hash = (37 * hash) + CLIENT_STATS_REPORT_INTERVAL_FIELD_NUMBER;
hash = (53 * hash) + getClientStatsReportInterval().hashCode();
}
- switch (initialResponseTypeCase_) {
- case 2:
- hash = (37 * hash) + LOAD_BALANCER_DELEGATE_FIELD_NUMBER;
- hash = (53 * hash) + getLoadBalancerDelegate().hashCode();
- break;
- case 0:
- default:
- }
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -420,14 +361,14 @@ public final class InitialLoadBalanceResponse extends
}
public Builder clear() {
super.clear();
+ loadBalancerDelegate_ = "";
+
if (clientStatsReportIntervalBuilder_ == null) {
clientStatsReportInterval_ = null;
} else {
clientStatsReportInterval_ = null;
clientStatsReportIntervalBuilder_ = null;
}
- initialResponseTypeCase_ = 0;
- initialResponseType_ = null;
return this;
}
@@ -450,15 +391,12 @@ public final class InitialLoadBalanceResponse extends
public io.grpc.grpclb.InitialLoadBalanceResponse buildPartial() {
io.grpc.grpclb.InitialLoadBalanceResponse result = new io.grpc.grpclb.InitialLoadBalanceResponse(this);
- if (initialResponseTypeCase_ == 2) {
- result.initialResponseType_ = initialResponseType_;
- }
+ result.loadBalancerDelegate_ = loadBalancerDelegate_;
if (clientStatsReportIntervalBuilder_ == null) {
result.clientStatsReportInterval_ = clientStatsReportInterval_;
} else {
result.clientStatsReportInterval_ = clientStatsReportIntervalBuilder_.build();
}
- result.initialResponseTypeCase_ = initialResponseTypeCase_;
onBuilt();
return result;
}
@@ -500,20 +438,13 @@ public final class InitialLoadBalanceResponse extends
public Builder mergeFrom(io.grpc.grpclb.InitialLoadBalanceResponse other) {
if (other == io.grpc.grpclb.InitialLoadBalanceResponse.getDefaultInstance()) return this;
+ if (!other.getLoadBalancerDelegate().isEmpty()) {
+ loadBalancerDelegate_ = other.loadBalancerDelegate_;
+ onChanged();
+ }
if (other.hasClientStatsReportInterval()) {
mergeClientStatsReportInterval(other.getClientStatsReportInterval());
}
- switch (other.getInitialResponseTypeCase()) {
- case LOAD_BALANCER_DELEGATE: {
- initialResponseTypeCase_ = 2;
- initialResponseType_ = other.initialResponseType_;
- onChanged();
- break;
- }
- case INITIALRESPONSETYPE_NOT_SET: {
- break;
- }
- }
onChanged();
return this;
}
@@ -539,44 +470,25 @@ public final class InitialLoadBalanceResponse extends
}
return this;
}
- private int initialResponseTypeCase_ = 0;
- private java.lang.Object initialResponseType_;
- public InitialResponseTypeCase
- getInitialResponseTypeCase() {
- return InitialResponseTypeCase.forNumber(
- initialResponseTypeCase_);
- }
-
- public Builder clearInitialResponseType() {
- initialResponseTypeCase_ = 0;
- initialResponseType_ = null;
- onChanged();
- return this;
- }
-
+ private java.lang.Object loadBalancerDelegate_ = "";
/**
*
- * This is an application layer redirect that indicates the client should
- * use the specified server for load balancing. When this field is set in
+ * This is an application layer redirect that indicates the client should use
+ * the specified server for load balancing. When this field is non-empty in
* the response, the client should open a separate connection to the
* load_balancer_delegate and call the BalanceLoad method.
*
*
- * optional string load_balancer_delegate = 2;
+ * optional string load_balancer_delegate = 1;
*/
public java.lang.String getLoadBalancerDelegate() {
- java.lang.Object ref = "";
- if (initialResponseTypeCase_ == 2) {
- ref = initialResponseType_;
- }
+ java.lang.Object ref = loadBalancerDelegate_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
- if (initialResponseTypeCase_ == 2) {
- initialResponseType_ = s;
- }
+ loadBalancerDelegate_ = s;
return s;
} else {
return (java.lang.String) ref;
@@ -584,27 +496,22 @@ public final class InitialLoadBalanceResponse extends
}
/**
*
- * This is an application layer redirect that indicates the client should
- * use the specified server for load balancing. When this field is set in
+ * This is an application layer redirect that indicates the client should use
+ * the specified server for load balancing. When this field is non-empty in
* the response, the client should open a separate connection to the
* load_balancer_delegate and call the BalanceLoad method.
*
*
- * optional string load_balancer_delegate = 2;
+ * optional string load_balancer_delegate = 1;
*/
public com.google.protobuf.ByteString
getLoadBalancerDelegateBytes() {
- java.lang.Object ref = "";
- if (initialResponseTypeCase_ == 2) {
- ref = initialResponseType_;
- }
+ java.lang.Object ref = loadBalancerDelegate_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
- if (initialResponseTypeCase_ == 2) {
- initialResponseType_ = b;
- }
+ loadBalancerDelegate_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
@@ -612,51 +519,49 @@ public final class InitialLoadBalanceResponse extends
}
/**
*
- * This is an application layer redirect that indicates the client should
- * use the specified server for load balancing. When this field is set in
+ * This is an application layer redirect that indicates the client should use
+ * the specified server for load balancing. When this field is non-empty in
* the response, the client should open a separate connection to the
* load_balancer_delegate and call the BalanceLoad method.
*
*
- * optional string load_balancer_delegate = 2;
+ * optional string load_balancer_delegate = 1;
*/
public Builder setLoadBalancerDelegate(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
- initialResponseTypeCase_ = 2;
- initialResponseType_ = value;
+
+ loadBalancerDelegate_ = value;
onChanged();
return this;
}
/**
*
- * This is an application layer redirect that indicates the client should
- * use the specified server for load balancing. When this field is set in
+ * This is an application layer redirect that indicates the client should use
+ * the specified server for load balancing. When this field is non-empty in
* the response, the client should open a separate connection to the
* load_balancer_delegate and call the BalanceLoad method.
*
*
- * optional string load_balancer_delegate = 2;
+ * optional string load_balancer_delegate = 1;
*/
public Builder clearLoadBalancerDelegate() {
- if (initialResponseTypeCase_ == 2) {
- initialResponseTypeCase_ = 0;
- initialResponseType_ = null;
- onChanged();
- }
+
+ loadBalancerDelegate_ = getDefaultInstance().getLoadBalancerDelegate();
+ onChanged();
return this;
}
/**
*
- * This is an application layer redirect that indicates the client should
- * use the specified server for load balancing. When this field is set in
+ * This is an application layer redirect that indicates the client should use
+ * the specified server for load balancing. When this field is non-empty in
* the response, the client should open a separate connection to the
* load_balancer_delegate and call the BalanceLoad method.
*
*
- * optional string load_balancer_delegate = 2;
+ * optional string load_balancer_delegate = 1;
*/
public Builder setLoadBalancerDelegateBytes(
com.google.protobuf.ByteString value) {
@@ -664,8 +569,8 @@ public final class InitialLoadBalanceResponse extends
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
- initialResponseTypeCase_ = 2;
- initialResponseType_ = value;
+
+ loadBalancerDelegate_ = value;
onChanged();
return this;
}
@@ -680,7 +585,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
public boolean hasClientStatsReportInterval() {
return clientStatsReportIntervalBuilder_ != null || clientStatsReportInterval_ != null;
@@ -692,7 +597,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
public com.google.protobuf.Duration getClientStatsReportInterval() {
if (clientStatsReportIntervalBuilder_ == null) {
@@ -708,7 +613,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
public Builder setClientStatsReportInterval(com.google.protobuf.Duration value) {
if (clientStatsReportIntervalBuilder_ == null) {
@@ -730,7 +635,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
public Builder setClientStatsReportInterval(
com.google.protobuf.Duration.Builder builderForValue) {
@@ -750,7 +655,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
public Builder mergeClientStatsReportInterval(com.google.protobuf.Duration value) {
if (clientStatsReportIntervalBuilder_ == null) {
@@ -774,7 +679,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
public Builder clearClientStatsReportInterval() {
if (clientStatsReportIntervalBuilder_ == null) {
@@ -794,7 +699,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
public com.google.protobuf.Duration.Builder getClientStatsReportIntervalBuilder() {
@@ -808,7 +713,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
public com.google.protobuf.DurationOrBuilder getClientStatsReportIntervalOrBuilder() {
if (clientStatsReportIntervalBuilder_ != null) {
@@ -825,7 +730,7 @@ public final class InitialLoadBalanceResponse extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
private com.google.protobuf.SingleFieldBuilderV3<
com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder>
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponseOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponseOrBuilder.java
index 7b495020b2..b6104f6bd9 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponseOrBuilder.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponseOrBuilder.java
@@ -9,24 +9,24 @@ public interface InitialLoadBalanceResponseOrBuilder extends
/**
*
- * This is an application layer redirect that indicates the client should
- * use the specified server for load balancing. When this field is set in
+ * This is an application layer redirect that indicates the client should use
+ * the specified server for load balancing. When this field is non-empty in
* the response, the client should open a separate connection to the
* load_balancer_delegate and call the BalanceLoad method.
*
*
- * optional string load_balancer_delegate = 2;
+ * optional string load_balancer_delegate = 1;
*/
java.lang.String getLoadBalancerDelegate();
/**
*
- * This is an application layer redirect that indicates the client should
- * use the specified server for load balancing. When this field is set in
+ * This is an application layer redirect that indicates the client should use
+ * the specified server for load balancing. When this field is non-empty in
* the response, the client should open a separate connection to the
* load_balancer_delegate and call the BalanceLoad method.
*
*
- * optional string load_balancer_delegate = 2;
+ * optional string load_balancer_delegate = 1;
*/
com.google.protobuf.ByteString
getLoadBalancerDelegateBytes();
@@ -38,7 +38,7 @@ public interface InitialLoadBalanceResponseOrBuilder extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
boolean hasClientStatsReportInterval();
/**
@@ -48,7 +48,7 @@ public interface InitialLoadBalanceResponseOrBuilder extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
com.google.protobuf.Duration getClientStatsReportInterval();
/**
@@ -58,9 +58,7 @@ public interface InitialLoadBalanceResponseOrBuilder extends
* positive.
*
*
- * optional .google.protobuf.Duration client_stats_report_interval = 3;
+ * optional .google.protobuf.Duration client_stats_report_interval = 2;
*/
com.google.protobuf.DurationOrBuilder getClientStatsReportIntervalOrBuilder();
-
- public io.grpc.grpclb.InitialLoadBalanceResponse.InitialResponseTypeCase getInitialResponseTypeCase();
}
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java
index 699aff341c..840eda6489 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java
@@ -71,19 +71,19 @@ public final class LoadBalancerProto {
"al_response\030\001 \001(\0132&.grpc.lb.v1.InitialLo" +
"adBalanceResponseH\000\022-\n\013server_list\030\002 \001(\013" +
"2\026.grpc.lb.v1.ServerListH\000B\034\n\032load_balan" +
- "ce_response_type\"\230\001\n\032InitialLoadBalanceR" +
- "esponse\022 \n\026load_balancer_delegate\030\002 \001(\tH" +
- "\000\022?\n\034client_stats_report_interval\030\003 \001(\0132" +
- "\031.google.protobuf.DurationB\027\n\025initial_re" +
- "sponse_type\"i\n\nServerList\022#\n\007servers\030\001 \003" +
- "(\0132\022.grpc.lb.v1.Server\0226\n\023expiration_int" +
- "erval\030\003 \001(\0132\031.google.protobuf.Duration\"\\",
- "\n\006Server\022\022\n\nip_address\030\001 \001(\014\022\014\n\004port\030\002 \001" +
- "(\005\022\032\n\022load_balance_token\030\003 \001(\t\022\024\n\014drop_r" +
- "equest\030\004 \001(\0102b\n\014LoadBalancer\022R\n\013BalanceL" +
- "oad\022\036.grpc.lb.v1.LoadBalanceRequest\032\037.gr" +
- "pc.lb.v1.LoadBalanceResponse(\0010\001B%\n\016io.g" +
- "rpc.grpclbB\021LoadBalancerProtoP\001b\006proto3"
+ "ce_response_type\"}\n\032InitialLoadBalanceRe" +
+ "sponse\022\036\n\026load_balancer_delegate\030\001 \001(\t\022?" +
+ "\n\034client_stats_report_interval\030\002 \001(\0132\031.g" +
+ "oogle.protobuf.Duration\"i\n\nServerList\022#\n" +
+ "\007servers\030\001 \003(\0132\022.grpc.lb.v1.Server\0226\n\023ex" +
+ "piration_interval\030\003 \001(\0132\031.google.protobu" +
+ "f.Duration\"\\\n\006Server\022\022\n\nip_address\030\001 \001(\014",
+ "\022\014\n\004port\030\002 \001(\005\022\032\n\022load_balance_token\030\003 \001" +
+ "(\t\022\024\n\014drop_request\030\004 \001(\0102b\n\014LoadBalancer" +
+ "\022R\n\013BalanceLoad\022\036.grpc.lb.v1.LoadBalance" +
+ "Request\032\037.grpc.lb.v1.LoadBalanceResponse" +
+ "(\0010\001B%\n\016io.grpc.grpclbB\021LoadBalancerProt" +
+ "oP\001b\006proto3"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -127,7 +127,7 @@ public final class LoadBalancerProto {
internal_static_grpc_lb_v1_InitialLoadBalanceResponse_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_grpc_lb_v1_InitialLoadBalanceResponse_descriptor,
- new java.lang.String[] { "LoadBalancerDelegate", "ClientStatsReportInterval", "InitialResponseType", });
+ new java.lang.String[] { "LoadBalancerDelegate", "ClientStatsReportInterval", });
internal_static_grpc_lb_v1_ServerList_descriptor =
getDescriptor().getMessageTypes().get(5);
internal_static_grpc_lb_v1_ServerList_fieldAccessorTable = new
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java b/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java
index c905f31dd1..09080b4b9c 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java
@@ -121,9 +121,10 @@ public final class Server extends
private volatile java.lang.Object loadBalanceToken_;
/**
*
- * An opaque token that is passed from the client to the server in metadata.
- * The server may expect this token to indicate that the request from the
- * client was load balanced.
+ * An opaque but printable token given to the frontend for each pick. All
+ * frontend requests for that pick must include the token in its initial
+ * metadata. The token is used by the backend to verify the request and to
+ * allow the backend to report load to the gRPC LB system.
*
*
* optional string load_balance_token = 3;
@@ -142,9 +143,10 @@ public final class Server extends
}
/**
*
- * An opaque token that is passed from the client to the server in metadata.
- * The server may expect this token to indicate that the request from the
- * client was load balanced.
+ * An opaque but printable token given to the frontend for each pick. All
+ * frontend requests for that pick must include the token in its initial
+ * metadata. The token is used by the backend to verify the request and to
+ * allow the backend to report load to the gRPC LB system.
*
*
* optional string load_balance_token = 3;
@@ -583,9 +585,10 @@ public final class Server extends
private java.lang.Object loadBalanceToken_ = "";
/**
*
- * An opaque token that is passed from the client to the server in metadata.
- * The server may expect this token to indicate that the request from the
- * client was load balanced.
+ * An opaque but printable token given to the frontend for each pick. All
+ * frontend requests for that pick must include the token in its initial
+ * metadata. The token is used by the backend to verify the request and to
+ * allow the backend to report load to the gRPC LB system.
*
*
* optional string load_balance_token = 3;
@@ -604,9 +607,10 @@ public final class Server extends
}
/**
*
- * An opaque token that is passed from the client to the server in metadata.
- * The server may expect this token to indicate that the request from the
- * client was load balanced.
+ * An opaque but printable token given to the frontend for each pick. All
+ * frontend requests for that pick must include the token in its initial
+ * metadata. The token is used by the backend to verify the request and to
+ * allow the backend to report load to the gRPC LB system.
*
*
* optional string load_balance_token = 3;
@@ -626,9 +630,10 @@ public final class Server extends
}
/**
*
- * An opaque token that is passed from the client to the server in metadata.
- * The server may expect this token to indicate that the request from the
- * client was load balanced.
+ * An opaque but printable token given to the frontend for each pick. All
+ * frontend requests for that pick must include the token in its initial
+ * metadata. The token is used by the backend to verify the request and to
+ * allow the backend to report load to the gRPC LB system.
*
*
* optional string load_balance_token = 3;
@@ -645,9 +650,10 @@ public final class Server extends
}
/**
*
- * An opaque token that is passed from the client to the server in metadata.
- * The server may expect this token to indicate that the request from the
- * client was load balanced.
+ * An opaque but printable token given to the frontend for each pick. All
+ * frontend requests for that pick must include the token in its initial
+ * metadata. The token is used by the backend to verify the request and to
+ * allow the backend to report load to the gRPC LB system.
*
*
* optional string load_balance_token = 3;
@@ -660,9 +666,10 @@ public final class Server extends
}
/**
*
- * An opaque token that is passed from the client to the server in metadata.
- * The server may expect this token to indicate that the request from the
- * client was load balanced.
+ * An opaque but printable token given to the frontend for each pick. All
+ * frontend requests for that pick must include the token in its initial
+ * metadata. The token is used by the backend to verify the request and to
+ * allow the backend to report load to the gRPC LB system.
*
*
* optional string load_balance_token = 3;
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/ServerOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/ServerOrBuilder.java
index d8b76a94af..df0a872238 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/ServerOrBuilder.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ServerOrBuilder.java
@@ -28,9 +28,10 @@ public interface ServerOrBuilder extends
/**
*
- * An opaque token that is passed from the client to the server in metadata.
- * The server may expect this token to indicate that the request from the
- * client was load balanced.
+ * An opaque but printable token given to the frontend for each pick. All
+ * frontend requests for that pick must include the token in its initial
+ * metadata. The token is used by the backend to verify the request and to
+ * allow the backend to report load to the gRPC LB system.
*
*
* optional string load_balance_token = 3;
@@ -38,9 +39,10 @@ public interface ServerOrBuilder extends
java.lang.String getLoadBalanceToken();
/**
*
- * An opaque token that is passed from the client to the server in metadata.
- * The server may expect this token to indicate that the request from the
- * client was load balanced.
+ * An opaque but printable token given to the frontend for each pick. All
+ * frontend requests for that pick must include the token in its initial
+ * metadata. The token is used by the backend to verify the request and to
+ * allow the backend to report load to the gRPC LB system.
*
*
* optional string load_balance_token = 3;
diff --git a/grpclb/src/main/proto/load_balancer.proto b/grpclb/src/main/proto/load_balancer.proto
index a54600cd3e..e296b9a3a4 100644
--- a/grpclb/src/main/proto/load_balancer.proto
+++ b/grpclb/src/main/proto/load_balancer.proto
@@ -57,21 +57,16 @@ message LoadBalanceResponse {
}
message InitialLoadBalanceResponse {
- oneof initial_response_type {
- // TODO(zhangkun83): ClientConfig not yet defined
- //ClientConfig client_config = 1;
-
- // This is an application layer redirect that indicates the client should
- // use the specified server for load balancing. When this field is set in
- // the response, the client should open a separate connection to the
- // load_balancer_delegate and call the BalanceLoad method.
- string load_balancer_delegate = 2;
- }
+ // This is an application layer redirect that indicates the client should use
+ // the specified server for load balancing. When this field is non-empty in
+ // the response, the client should open a separate connection to the
+ // load_balancer_delegate and call the BalanceLoad method.
+ string load_balancer_delegate = 1;
// This interval defines how often the client should send the client stats
// to the load balancer. Stats should only be reported when the duration is
// positive.
- google.protobuf.Duration client_stats_report_interval = 3;
+ google.protobuf.Duration client_stats_report_interval = 2;
}
message ServerList {
@@ -96,9 +91,10 @@ message Server {
// A resolved port number for the server.
int32 port = 2;
- // An opaque token that is passed from the client to the server in metadata.
- // The server may expect this token to indicate that the request from the
- // client was load balanced.
+ // An opaque but printable token given to the frontend for each pick. All
+ // frontend requests for that pick must include the token in its initial
+ // metadata. The token is used by the backend to verify the request and to
+ // allow the backend to report load to the gRPC LB system.
string load_balance_token = 3;
// Indicates whether this particular request should be dropped by the client