Fixed a bug that could fail the build if unable to findMissingBlobs.

Closes bazelbuild#12369. PiperOrigin-RevId: 339427586
comius · Oct 28, 2020 · 5a2b7df · 5a2b7df
1 parent e794ee6
commit 5a2b7df
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/remote/GrpcCacheClient.java b/src/main/java/com/google/devtools/build/lib/remote/GrpcCacheClient.java
@@ -26,6 +26,7 @@
 import build.bazel.remote.execution.v2.FindMissingBlobsRequest;
 import build.bazel.remote.execution.v2.FindMissingBlobsResponse;
 import build.bazel.remote.execution.v2.GetActionResultRequest;
+import build.bazel.remote.execution.v2.RequestMetadata;
 import build.bazel.remote.execution.v2.UpdateActionResultRequest;
 import com.google.bytestream.ByteStreamGrpc;
 import com.google.bytestream.ByteStreamGrpc.ByteStreamStub;
@@ -198,6 +199,8 @@ public ListenableFuture<ImmutableSet<Digest>> findMissingDigests(Iterable<Digest
                   return result.build();
                 },
                 MoreExecutors.directExecutor());
+
+    RequestMetadata requestMetadata = TracingMetadataUtils.fromCurrentContext();
     return Futures.catchingAsync(
         success,
         RuntimeException.class,
@@ -207,7 +210,7 @@ public ListenableFuture<ImmutableSet<Digest>> findMissingDigests(Iterable<Digest
                     String.format(
                         "findMissingBlobs(%d) for %s: %s",
                         requestBuilder.getBlobDigestsCount(),
-                        TracingMetadataUtils.fromCurrentContext().getActionId(),
+                        requestMetadata.getActionId(),
                         e.getMessage()),
                     e)),
         MoreExecutors.directExecutor());