commit 2df3d39c8dec5d8cffc13c2f587880c862e9cdaa
author Lauri Peltonen <lape@iki.fi> Fri Feb 26 04:37:48 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Feb 26 04:38:39 2021 -0800
tree 7db70676132eaf53c5fa38ecfa5f7911feceaba8
parent 63bc1c7d0853dc187e4b96a490d733fb29f79664

[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.

https://github.com/bazelbuild/bazel/issues/12927

Closes #13105.

PiperOrigin-RevId: 359732452

distdir_deps.bzl

diff --git a/distdir_deps.bzl b/distdir_deps.bzl
index 1739a25..48b7e4f 100644
--- a/distdir_deps.bzl
+++ b/distdir_deps.bzl
@@ -121,16 +121,16 @@
         ],
     },
     "com_github_grpc_grpc": {
-        "archive": "v1.32.0.tar.gz",
-        "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a",
-        "strip_prefix": "grpc-1.32.0",
+        "archive": "v1.33.1.tar.gz",
+        "sha256": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63",
+        "strip_prefix": "grpc-1.33.1",
         "urls": [
-            "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",
+            "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz",
+            "https://github.com/grpc/grpc/archive/v1.33.1.tar.gz",
         ],
         "patch_args": ["-p1"],
         "patches": [
-            "//third_party/grpc:grpc_1.32.0.patch",
+            "//third_party/grpc:grpc_1.33.1.patch",
         ],
         "used_in": [
             "additional_distfiles",

scripts/bootstrap/compile.sh

diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index a674d43..a47a8e9 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -27,7 +27,7 @@
 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 src/main/java/com/google/devtools/build/lib/packages/metrics/package_metrics.proto -name "*.proto")
 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" " ")
-GRPC_JAVA_VERSION=1.32.2
+GRPC_JAVA_VERSION=1.33.1
 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e ".*${GRPC_JAVA_VERSION}.*jar" | tr "\n" " ")
 GUAVA_VERSION=29.0
 GUAVA_JARS=$(find third_party/guava -name '*.jar' | grep -e ".*${GUAVA_VERSION}.*jar" | tr "\n" " ")