Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions alts/src/main/proto/grpc/gcp/handshaker.proto
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ message StartClientHandshakeReq {

// (Optional) RPC protocol versions supported by the client.
RpcProtocolVersions rpc_versions = 9;

// (Optional) Maximum frame size supported by the client.
uint32 max_frame_size = 10;
}

message ServerHandshakeParameters {
Expand Down Expand Up @@ -143,6 +146,9 @@ message StartServerHandshakeReq {

// (Optional) RPC protocol versions supported by the server.
RpcProtocolVersions rpc_versions = 6;

// (Optional) Maximum frame size supported by the server.
uint32 max_frame_size = 7;
}

message NextHandshakeMessageReq {
Expand Down Expand Up @@ -190,6 +196,9 @@ message HandshakerResult {

// The RPC protocol versions supported by the peer.
RpcProtocolVersions peer_rpc_versions = 7;

// The maximum frame size of the peer.
uint32 max_frame_size = 8;
}

message HandshakerStatus {
Expand Down
21 changes: 3 additions & 18 deletions grpclb/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("//:java_grpc_library.bzl", "java_grpc_library")

java_library(
Expand All @@ -9,7 +8,6 @@ java_library(
visibility = ["//visibility:public"],
deps = [
":load_balancer_java_grpc",
":load_balancer_java_proto",
"//api",
"//core:internal",
"//core:util",
Expand All @@ -18,25 +16,12 @@ java_library(
"@com_google_guava_guava//jar",
"@com_google_j2objc_j2objc_annotations//jar",
"@com_google_protobuf//:protobuf_java_util",
"@io_grpc_grpc_proto//:grpclb_load_balancer_java_proto",
],
)

proto_library(
name = "load_balancer_proto",
srcs = ["src/main/proto/grpc/lb/v1/load_balancer.proto"],
deps = [
"@com_google_protobuf//:duration_proto",
"@com_google_protobuf//:timestamp_proto",
],
)

java_proto_library(
name = "load_balancer_java_proto",
deps = [":load_balancer_proto"],
)

java_grpc_library(
name = "load_balancer_java_grpc",
srcs = [":load_balancer_proto"],
deps = [":load_balancer_java_proto"],
srcs = ["@io_grpc_grpc_proto//:grpclb_load_balancer_proto"],
deps = ["@io_grpc_grpc_proto//:grpclb_load_balancer_java_proto"],
)
5 changes: 2 additions & 3 deletions grpclb/src/main/proto/grpc/lb/v1/load_balancer.proto
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,12 @@ message LoadBalanceResponse {

// If this field is set, then the client should eagerly enter fallback
// mode (even if there are existing, healthy connections to backends).
// See go/grpclb-explicit-fallback for more details.
FallbackResponse fallback_response = 3;
}
}

message FallbackResponse {}

message InitialLoadBalanceResponse {
// 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
Expand All @@ -116,8 +117,6 @@ message InitialLoadBalanceResponse {
google.protobuf.Duration client_stats_report_interval = 2;
}

message FallbackResponse {}

message ServerList {
// Contains a list of servers selected by the load balancer. The list will
// be updated when server resolutions change or as needed to balance load
Expand Down
6 changes: 3 additions & 3 deletions repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,9 @@ def com_squareup_okio_okio():
def io_grpc_grpc_proto():
http_archive(
name = "io_grpc_grpc_proto",
sha256 = "9d96f861f01ed9e3d805024e72a6b218b626da2114c69c1cad5d0e967c8e23be",
strip_prefix = "grpc-proto-435d723289d348e1bc420d420b364369d565182a",
urls = ["https://github.com/grpc/grpc-proto/archive/435d723289d348e1bc420d420b364369d565182a.zip"],
sha256 = "e3f2bf5caa217b8a703acb52cc5a503f06545b6be7889e44ea428f29e7320e9d",
strip_prefix = "grpc-proto-1ff7890719cea62825beeff16d6c2c66cf51ea90",
urls = ["https://github.com/grpc/grpc-proto/archive/1ff7890719cea62825beeff16d6c2c66cf51ea90.zip"],
)

def io_netty_netty_buffer():
Expand Down