Skip to content

Commit 848a517

Browse files
scelephilwo
scele
authored and
philwo
committed
[2/3] Bump grpc to 1.33.1 to fix corruption when downloading CAS blobs
Part 2: Switch to grpc 1.33.1. grpc-java versions 1.27 through 1.32 had a bug where messages could arrive after the call was reported clsoed. In the case of bazel, this meant that in GrpcCacheClient, onNext could be called after onError. This leads to offset bookkeeping getting out of sync, and corrupts the CAS blob download. #12927
1 parent a6eff39 commit 848a517

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎WORKSPACE‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ distdir_tar(
174174
# protocolbuffers/protobuf
175175
"v3.13.0.tar.gz",
176176
# grpc/grpc
177-
"v1.32.0.tar.gz",
177+
"v1.33.1.tar.gz",
178178
# c-ares/c-ares
179179
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
180180
# protocolbuffers/upb
@@ -215,7 +215,7 @@ distdir_tar(
215215
# protocolbuffers/protobuf
216216
"v3.13.0.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
217217
# grpc/grpc
218-
"v1.32.0.tar.gz": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a",
218+
"v1.33.1.tar.gz": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63",
219219
# c-ares/c-ares
220220
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a",
221221
# protocolbuffers/upb
@@ -298,9 +298,9 @@ distdir_tar(
298298
"https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
299299
],
300300
# grpc/grpc
301-
"v1.32.0.tar.gz": [
302-
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz",
303-
"https://github.com/grpc/grpc/archive/v1.32.0.tar.gz",
301+
"v1.33.1.tar.gz": [
302+
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz",
303+
"https://github.com/grpc/grpc/archive/v1.33.1.tar.gz",
304304
],
305305
# c-ares/c-ares
306306
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": [
@@ -567,7 +567,7 @@ distdir_tar(
567567
# protocolbuffers/protobuf
568568
"v3.13.0.tar.gz",
569569
# grpc/grpc
570-
"v1.32.0.tar.gz",
570+
"v1.33.1.tar.gz",
571571
# c-ares/c-ares
572572
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
573573
# protocolbuffers/upb
@@ -601,7 +601,7 @@ distdir_tar(
601601
# protocolbuffers/protobuf
602602
"v3.13.0.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
603603
# grpc/grpc
604-
"v1.32.0.tar.gz": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a",
604+
"v1.33.1.tar.gz": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63",
605605
# c-ares/c-ares
606606
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a",
607607
# protocolbuffers/upb
@@ -654,9 +654,9 @@ distdir_tar(
654654
"https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
655655
],
656656
# grpc/grpc
657-
"v1.32.0.tar.gz": [
658-
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz",
659-
"https://github.com/grpc/grpc/archive/v1.32.0.tar.gz",
657+
"v1.33.1.tar.gz": [
658+
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz",
659+
"https://github.com/grpc/grpc/archive/v1.33.1.tar.gz",
660660
],
661661
# c-ares/c-ares
662662
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": [
@@ -1147,12 +1147,12 @@ register_toolchains("//src/main/res:empty_rc_toolchain")
11471147
http_archive(
11481148
name = "com_github_grpc_grpc",
11491149
patch_args = ["-p1"],
1150-
patches = ["//third_party/grpc:grpc_1.32.0.patch"],
1151-
sha256 = "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a",
1152-
strip_prefix = "grpc-1.32.0",
1150+
patches = ["//third_party/grpc:grpc_1.33.1.patch"],
1151+
sha256 = "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63",
1152+
strip_prefix = "grpc-1.33.1",
11531153
urls = [
1154-
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz",
1155-
"https://github.com/grpc/grpc/archive/v1.32.0.tar.gz",
1154+
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz",
1155+
"https://github.com/grpc/grpc/archive/v1.33.1.tar.gz",
11561156
],
11571157
)
11581158

‎scripts/bootstrap/compile.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fi
2727
GOOGLE_API_PROTOS="$(grep -o '".*\.proto"' third_party/googleapis/BUILD.bazel | sed 's/"//g' | sed 's|^|third_party/googleapis/|g')"
2828
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 src/main/java/com/google/devtools/build/lib/packages/metrics/package_metrics.proto -name "*.proto")
2929
LIBRARY_JARS=$(find $ADDITIONAL_JARS third_party -name '*.jar' | grep -Fv JavaBuilder | grep -Fv third_party/guava/guava | grep -ve 'third_party/grpc/grpc.*jar' | tr "\n" " ")
30-
GRPC_JAVA_VERSION=1.32.2
30+
GRPC_JAVA_VERSION=1.33.1
3131
GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e ".*${GRPC_JAVA_VERSION}.*jar" | tr "\n" " ")
3232
GUAVA_VERSION=29.0
3333
GUAVA_JARS=$(find third_party/guava -name '*.jar' | grep -e ".*${GUAVA_VERSION}.*jar" | tr "\n" " ")

0 commit comments

Comments
 (0)