From 3278ffd9c9efa5255356a7b13622db5d4470b882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?X=C3=B9d=C5=8Dng=20Y=C3=A1ng?= <wyverald@gmail.com>
Date: Thu, 20 Jun 2024 16:40:23 -0400
Subject: [PATCH] [7.2.1] Add missing category submessage. (#22828)

Fixes #22741.

PiperOrigin-RevId: 643932127
Change-Id: Ia9566acb7b828224679ad57b71644281a8e52db4

Co-authored-by: Googler <chiwang@google.com>
---
 .../build/lib/skyframe/CompletionFunction.java       | 12 ++++++++++--
 src/main/protobuf/failure_details.proto              |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java
index 5715c598eecd35..07e94efde35fc3 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.lib.skyframe;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 
 import com.google.common.collect.ImmutableCollection;
@@ -56,6 +55,7 @@
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
 import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
+import com.google.devtools.build.lib.server.FailureDetails.RemoteExecution;
 import com.google.devtools.build.lib.skyframe.ArtifactFunction.MissingArtifactValue;
 import com.google.devtools.build.lib.skyframe.ArtifactFunction.SourceArtifactException;
 import com.google.devtools.build.lib.skyframe.MetadataConsumerForMetrics.FilesMetricConsumer;
@@ -433,7 +433,15 @@ private void ensureToplevelArtifacts(
                               action,
                               true,
                               DetailedExitCode.of(
-                                  FailureDetail.newBuilder().setMessage(e.getMessage()).build()))),
+                                  FailureDetail.newBuilder()
+                                      .setMessage(e.getMessage())
+                                      .setRemoteExecution(
+                                          RemoteExecution.newBuilder()
+                                              .setCode(
+                                                  RemoteExecution.Code
+                                                      .TOPLEVEL_OUTPUTS_DOWNLOAD_FAILURE)
+                                              .build())
+                                      .build()))),
                   directExecutor()));
         }
       }
diff --git a/src/main/protobuf/failure_details.proto b/src/main/protobuf/failure_details.proto
index 5a0f7a9664793f..2eb9347d2c22d4 100644
--- a/src/main/protobuf/failure_details.proto
+++ b/src/main/protobuf/failure_details.proto
@@ -403,6 +403,7 @@ message RemoteExecution {
         [(metadata) = { exit_code: 1 }];
     ILLEGAL_OUTPUT = 15 [(metadata) = { exit_code: 1 }];
     INVALID_EXEC_AND_PLATFORM_PROPERTIES = 16 [(metadata) = { exit_code: 1 }];
+    TOPLEVEL_OUTPUTS_DOWNLOAD_FAILURE = 17 [(metadata) = { exit_code: 34 }];
   }
 
   Code code = 1;