grpclb: sync LB proto with grpc-proto

5 files changed, 92 insertions, 61 deletions

diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java
index 48c681b9a..500af5e3f 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java
@@ -84,8 +84,10 @@ private static final long serialVersionUID = 0L;
   private volatile java.lang.Object name_;
   /**
    * <pre>
-   * Name of load balanced service (IE, service.googleapis.com). Its
+   * The name of the load balanced service (e.g., service.googleapis.com). Its
    * length should be less than 256 bytes.
+   * The name might include a port number. How to handle the port number is up
+   * to the balancer.
    * </pre>
    *
    * <code>string name = 1;</code>
@@ -104,8 +106,10 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * Name of load balanced service (IE, service.googleapis.com). Its
+   * The name of the load balanced service (e.g., service.googleapis.com). Its
    * length should be less than 256 bytes.
+   * The name might include a port number. How to handle the port number is up
+   * to the balancer.
    * </pre>
    *
    * <code>string name = 1;</code>
@@ -410,8 +414,10 @@ private static final long serialVersionUID = 0L;
     private java.lang.Object name_ = "";
     /**
      * <pre>
-     * Name of load balanced service (IE, service.googleapis.com). Its
+     * The name of the load balanced service (e.g., service.googleapis.com). Its
      * length should be less than 256 bytes.
+     * The name might include a port number. How to handle the port number is up
+     * to the balancer.
      * </pre>
      *
      * <code>string name = 1;</code>
@@ -430,8 +436,10 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Name of load balanced service (IE, service.googleapis.com). Its
+     * The name of the load balanced service (e.g., service.googleapis.com). Its
      * length should be less than 256 bytes.
+     * The name might include a port number. How to handle the port number is up
+     * to the balancer.
      * </pre>
      *
      * <code>string name = 1;</code>
@@ -451,8 +459,10 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Name of load balanced service (IE, service.googleapis.com). Its
+     * The name of the load balanced service (e.g., service.googleapis.com). Its
      * length should be less than 256 bytes.
+     * The name might include a port number. How to handle the port number is up
+     * to the balancer.
      * </pre>
      *
      * <code>string name = 1;</code>
@@ -469,8 +479,10 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Name of load balanced service (IE, service.googleapis.com). Its
+     * The name of the load balanced service (e.g., service.googleapis.com). Its
      * length should be less than 256 bytes.
+     * The name might include a port number. How to handle the port number is up
+     * to the balancer.
      * </pre>
      *
      * <code>string name = 1;</code>
@@ -483,8 +495,10 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Name of load balanced service (IE, service.googleapis.com). Its
+     * The name of the load balanced service (e.g., service.googleapis.com). Its
      * length should be less than 256 bytes.
+     * The name might include a port number. How to handle the port number is up
+     * to the balancer.
      * </pre>
      *
      * <code>string name = 1;</code>
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java
index 46dd693c6..9ae9fd019 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java
@@ -9,8 +9,10 @@ public interface InitialLoadBalanceRequestOrBuilder extends
 
   /**
    * <pre>
-   * Name of load balanced service (IE, service.googleapis.com). Its
+   * The name of the load balanced service (e.g., service.googleapis.com). Its
    * length should be less than 256 bytes.
+   * The name might include a port number. How to handle the port number is up
+   * to the balancer.
    * </pre>
    *
    * <code>string name = 1;</code>
@@ -18,8 +20,10 @@ public interface InitialLoadBalanceRequestOrBuilder extends
   java.lang.String getName();
   /**
    * <pre>
-   * Name of load balanced service (IE, service.googleapis.com). Its
+   * The name of the load balanced service (e.g., service.googleapis.com). Its
    * length should be less than 256 bytes.
+   * The name might include a port number. How to handle the port number is up
+   * to the balancer.
    * </pre>
    *
    * <code>string name = 1;</code>
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 c10e19251..4720a0c37 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java
@@ -134,11 +134,12 @@ private static final long serialVersionUID = 0L;
   private volatile java.lang.Object loadBalanceToken_;
   /**
    * <pre>
-   * 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. The token is also
-   * used in client stats for reporting dropped calls.
+   * An opaque but printable token for load reporting. The client must include
+   * the token of the picked server into the initial metadata when it starts a
+   * call to that server. The token is used by the server to verify the request
+   * and to allow the server to report load to the gRPC LB system. The token is
+   * also used in client stats for reporting dropped calls.
+   * Its length can be variable but must be less than 50 bytes.
    * </pre>
    *
    * <code>string load_balance_token = 3;</code>
@@ -157,11 +158,12 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * 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. The token is also
-   * used in client stats for reporting dropped calls.
+   * An opaque but printable token for load reporting. The client must include
+   * the token of the picked server into the initial metadata when it starts a
+   * call to that server. The token is used by the server to verify the request
+   * and to allow the server to report load to the gRPC LB system. The token is
+   * also used in client stats for reporting dropped calls.
+   * Its length can be variable but must be less than 50 bytes.
    * </pre>
    *
    * <code>string load_balance_token = 3;</code>
@@ -620,11 +622,12 @@ private static final long serialVersionUID = 0L;
     private java.lang.Object loadBalanceToken_ = "";
     /**
      * <pre>
-     * 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. The token is also
-     * used in client stats for reporting dropped calls.
+     * An opaque but printable token for load reporting. The client must include
+     * the token of the picked server into the initial metadata when it starts a
+     * call to that server. The token is used by the server to verify the request
+     * and to allow the server to report load to the gRPC LB system. The token is
+     * also used in client stats for reporting dropped calls.
+     * Its length can be variable but must be less than 50 bytes.
      * </pre>
      *
      * <code>string load_balance_token = 3;</code>
@@ -643,11 +646,12 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * 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. The token is also
-     * used in client stats for reporting dropped calls.
+     * An opaque but printable token for load reporting. The client must include
+     * the token of the picked server into the initial metadata when it starts a
+     * call to that server. The token is used by the server to verify the request
+     * and to allow the server to report load to the gRPC LB system. The token is
+     * also used in client stats for reporting dropped calls.
+     * Its length can be variable but must be less than 50 bytes.
      * </pre>
      *
      * <code>string load_balance_token = 3;</code>
@@ -667,11 +671,12 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * 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. The token is also
-     * used in client stats for reporting dropped calls.
+     * An opaque but printable token for load reporting. The client must include
+     * the token of the picked server into the initial metadata when it starts a
+     * call to that server. The token is used by the server to verify the request
+     * and to allow the server to report load to the gRPC LB system. The token is
+     * also used in client stats for reporting dropped calls.
+     * Its length can be variable but must be less than 50 bytes.
      * </pre>
      *
      * <code>string load_balance_token = 3;</code>
@@ -688,11 +693,12 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * 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. The token is also
-     * used in client stats for reporting dropped calls.
+     * An opaque but printable token for load reporting. The client must include
+     * the token of the picked server into the initial metadata when it starts a
+     * call to that server. The token is used by the server to verify the request
+     * and to allow the server to report load to the gRPC LB system. The token is
+     * also used in client stats for reporting dropped calls.
+     * Its length can be variable but must be less than 50 bytes.
      * </pre>
      *
      * <code>string load_balance_token = 3;</code>
@@ -705,11 +711,12 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * 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. The token is also
-     * used in client stats for reporting dropped calls.
+     * An opaque but printable token for load reporting. The client must include
+     * the token of the picked server into the initial metadata when it starts a
+     * call to that server. The token is used by the server to verify the request
+     * and to allow the server to report load to the gRPC LB system. The token is
+     * also used in client stats for reporting dropped calls.
+     * Its length can be variable but must be less than 50 bytes.
      * </pre>
      *
      * <code>string load_balance_token = 3;</code>
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 42a13c803..573e11608 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/ServerOrBuilder.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ServerOrBuilder.java
@@ -28,11 +28,12 @@ public interface ServerOrBuilder extends
 
   /**
    * <pre>
-   * 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. The token is also
-   * used in client stats for reporting dropped calls.
+   * An opaque but printable token for load reporting. The client must include
+   * the token of the picked server into the initial metadata when it starts a
+   * call to that server. The token is used by the server to verify the request
+   * and to allow the server to report load to the gRPC LB system. The token is
+   * also used in client stats for reporting dropped calls.
+   * Its length can be variable but must be less than 50 bytes.
    * </pre>
    *
    * <code>string load_balance_token = 3;</code>
@@ -40,11 +41,12 @@ public interface ServerOrBuilder extends
   java.lang.String getLoadBalanceToken();
   /**
    * <pre>
-   * 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. The token is also
-   * used in client stats for reporting dropped calls.
+   * An opaque but printable token for load reporting. The client must include
+   * the token of the picked server into the initial metadata when it starts a
+   * call to that server. The token is used by the server to verify the request
+   * and to allow the server to report load to the gRPC LB system. The token is
+   * also used in client stats for reporting dropped calls.
+   * Its length can be variable but must be less than 50 bytes.
    * </pre>
    *
    * <code>string load_balance_token = 3;</code>
diff --git a/grpclb/src/main/proto/grpc/lb/v1/load_balancer.proto b/grpclb/src/main/proto/grpc/lb/v1/load_balancer.proto
index 2131401df..c9932bcf6 100644
--- a/grpclb/src/main/proto/grpc/lb/v1/load_balancer.proto
+++ b/grpclb/src/main/proto/grpc/lb/v1/load_balancer.proto
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// This file defines an the GRPCLB LoadBalancing protocol.
+// This file defines the GRPCLB LoadBalancing protocol.
 //
 // The canonical version of this proto can be found at
 // https://github.com/grpc/grpc-proto/blob/master/grpc/lb/v1/load_balancer.proto
@@ -45,8 +45,10 @@ message LoadBalanceRequest {
 }
 
 message InitialLoadBalanceRequest {
-  // Name of load balanced service (IE, service.googleapis.com). Its
+  // The name of the load balanced service (e.g., service.googleapis.com). Its
   // length should be less than 256 bytes.
+  // The name might include a port number. How to handle the port number is up
+  // to the balancer.
   string name = 1;
 }
 
@@ -130,11 +132,13 @@ message Server {
   // A resolved port number for the server.
   int32 port = 2;
 
-  // 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. The token is also
-  // used in client stats for reporting dropped calls.
+  // An opaque but printable token for load reporting. The client must include
+  // the token of the picked server into the initial metadata when it starts a
+  // call to that server. The token is used by the server to verify the request
+  // and to allow the server to report load to the gRPC LB system. The token is
+  // also used in client stats for reporting dropped calls.
+  //
+  // Its length can be variable but must be less than 50 bytes.
   string load_balance_token = 3;
 
   // Indicates whether this particular request should be dropped by the client.