Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2/3] Bump grpc to 1.32.x to fix a too_many_pings regression #12288

Closed
wants to merge 2 commits into from
Closed

[2/3] Bump grpc to 1.32.x to fix a too_many_pings regression #12288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f54c6b
[2/3] Bump grpc to 1.32.x to fix a too_many_pings regression
dmivankov Oct 15, 2020
14655ba
Revert "Try disabling grpc server auto flow control"
dmivankov Oct 16, 2020
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
50 changes: 25 additions & 25 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@ distdir_tar(
# protocolbuffers/protobuf
"v3.13.0.tar.gz",
# grpc/grpc
"v1.31.1.tar.gz",
"v1.32.0.tar.gz",
# c-ares/c-ares
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
# protocolbuffers/upb
"92e63da73328d01b417cf26c2de7b0a27a0f83af.tar.gz",
"382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz",
# google/re2
"aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
# abseil/abseil-cpp
Expand Down Expand Up @@ -215,11 +215,11 @@ distdir_tar(
# protocolbuffers/protobuf
"v3.13.0.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
# grpc/grpc
"v1.31.1.tar.gz": "f20f92a09f7245e2c437fbd729849ffe3b2dd39a46c9378d201f8f95cc9f12ea",
"v1.32.0.tar.gz": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a",
# c-ares/c-ares
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a",
# protocolbuffers/upb
"92e63da73328d01b417cf26c2de7b0a27a0f83af.tar.gz": "79f7de61203c4ee5e4fcb2f17c5f3338119d6eb94aca8bce05332d2c1cfee108",
"382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz": "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c",
# google/re2
"aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e",
# abseil/abseil-cpp
Expand Down Expand Up @@ -298,19 +298,19 @@ distdir_tar(
"https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
],
# grpc/grpc
"v1.31.1.tar.gz": [
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.31.1.tar.gz",
"https://github.com/grpc/grpc/archive/v1.31.1.tar.gz",
"v1.32.0.tar.gz": [
# "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz",
"https://github.com/grpc/grpc/archive/v1.32.0.tar.gz",
],
# c-ares/c-ares
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": [
"https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
"https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
],
# protocolbuffers/upb
"92e63da73328d01b417cf26c2de7b0a27a0f83af.tar.gz": [
"https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/92e63da73328d01b417cf26c2de7b0a27a0f83af.tar.gz",
"https://github.com/protocolbuffers/upb/archive/92e63da73328d01b417cf26c2de7b0a27a0f83af.tar.gz",
"382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz": [
"https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz",
"https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz",
],
# google/re2
"aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": [
Expand Down Expand Up @@ -567,11 +567,11 @@ distdir_tar(
# protocolbuffers/protobuf
"v3.13.0.tar.gz",
# grpc/grpc
"v1.31.1.tar.gz",
"v1.32.0.tar.gz",
# c-ares/c-ares
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
# protocolbuffers/upb
"92e63da73328d01b417cf26c2de7b0a27a0f83af.tar.gz",
"382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz",
# google/re2
"aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
# abseil/abseil-cpp
Expand Down Expand Up @@ -601,11 +601,11 @@ distdir_tar(
# protocolbuffers/protobuf
"v3.13.0.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
# grpc/grpc
"v1.31.1.tar.gz": "f20f92a09f7245e2c437fbd729849ffe3b2dd39a46c9378d201f8f95cc9f12ea",
"v1.32.0.tar.gz": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a",
# c-ares/c-ares
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a",
# protocolbuffers/upb
"92e63da73328d01b417cf26c2de7b0a27a0f83af.tar.gz": "79f7de61203c4ee5e4fcb2f17c5f3338119d6eb94aca8bce05332d2c1cfee108",
"382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz": "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c",
# google/re2
"aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e",
# abseil/abseil-cpp
Expand Down Expand Up @@ -654,19 +654,19 @@ distdir_tar(
"https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
],
# grpc/grpc
"v1.31.1.tar.gz": [
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.31.1.tar.gz",
"https://github.com/grpc/grpc/archive/v1.31.1.tar.gz",
"v1.32.0.tar.gz": [
# "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz",
"https://github.com/grpc/grpc/archive/v1.32.0.tar.gz",
],
# c-ares/c-ares
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": [
"https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
"https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
],
# protocolbuffers/upb
"92e63da73328d01b417cf26c2de7b0a27a0f83af.tar.gz": [
"https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/92e63da73328d01b417cf26c2de7b0a27a0f83af.tar.gz",
"https://github.com/protocolbuffers/upb/archive/92e63da73328d01b417cf26c2de7b0a27a0f83af.tar.gz",
"382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz": [
"https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz",
"https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz",
],
# google/re2
"aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": [
Expand Down Expand Up @@ -1142,12 +1142,12 @@ register_toolchains("//src/main/res:empty_rc_toolchain")
http_archive(
name = "com_github_grpc_grpc",
patch_args = ["-p1"],
patches = ["//third_party/grpc:grpc_1.31.1.patch"],
sha256 = "f20f92a09f7245e2c437fbd729849ffe3b2dd39a46c9378d201f8f95cc9f12ea",
strip_prefix = "grpc-1.31.1",
patches = ["//third_party/grpc:grpc_1.32.0.patch"],
sha256 = "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a",
strip_prefix = "grpc-1.32.0",
urls = [
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.31.1.tar.gz",
"https://github.com/grpc/grpc/archive/v1.31.1.tar.gz",
# "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz",
"https://github.com/grpc/grpc/archive/v1.32.0.tar.gz",
],
)

Expand Down
2 changes: 1 addition & 1 deletion scripts/bootstrap/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fi
GOOGLE_API_PROTOS="$(grep -o '".*\.proto"' third_party/googleapis/BUILD.bazel | sed 's/"//g' | sed 's|^|third_party/googleapis/|g')"
PROTO_FILES=$(find third_party/remoteapis ${GOOGLE_API_PROTOS} third_party/pprof src/main/protobuf src/main/java/com/google/devtools/build/lib/buildeventstream/proto src/main/java/com/google/devtools/build/skyframe src/main/java/com/google/devtools/build/lib/skyframe/proto src/main/java/com/google/devtools/build/lib/bazel/debug src/main/java/com/google/devtools/build/lib/starlarkdebug/proto -name "*.proto")
LIBRARY_JARS=$(find $ADDITIONAL_JARS third_party -name '*.jar' | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -ve 'third_party/grpc/grpc.*jar' | tr "\n" " ")
GRPC_JAVA_VERSION=1.31.1
GRPC_JAVA_VERSION=1.32.2
GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e ".*${GRPC_JAVA_VERSION}.*jar" | tr "\n" " ")
GUAVA_VERSION=25.1
GUAVA_JARS=$(find third_party/guava -name '*.jar' | grep -e ".*${GUAVA_VERSION}.*jar" | tr "\n" " ")
Expand Down
10 changes: 1 addition & 9 deletions src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,22 +388,14 @@ public void serve() throws AbruptExitException {
throw new IOException("ipv6 is not preferred on the system.");
}
server =
NettyServerBuilder.forAddress(address)
.addService(this)
.directExecutor()
// disable auto flow control https://github.com/bazelbuild/bazel/issues/12264
.flowControlWindow(NettyServerBuilder.DEFAULT_FLOW_CONTROL_WINDOW)
.build()
.start();
NettyServerBuilder.forAddress(address).addService(this).directExecutor().build().start();
} catch (IOException ipv6Exception) {
address = new InetSocketAddress("127.0.0.1", port);
try {
server =
NettyServerBuilder.forAddress(address)
.addService(this)
.directExecutor()
// disable auto flow control https://github.com/bazelbuild/bazel/issues/12264
.flowControlWindow(NettyServerBuilder.DEFAULT_FLOW_CONTROL_WINDOW)
.build()
.start();
} catch (IOException ipv4Exception) {
Expand Down
3 changes: 0 additions & 3 deletions src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,6 @@ public Server startServer() throws IOException {
logger.atInfo().log("Execution disabled, only serving cache requests");
}

// disable auto flow control https://github.com/bazelbuild/bazel/issues/12264
b.flowControlWindow(NettyServerBuilder.DEFAULT_FLOW_CONTROL_WINDOW);

Server server = b.build();
logger.atInfo().log("Starting gRPC server on port %d", workerOptions.listenPort);
server.start();
Expand Down