Simplify how auxiliary metadata is set in ExecuteTaskAndStreamResults (…

…#7937)

Set it in only one place instead of two.

enterprise/server/remote_execution/executor/executor.go

@@ -222,9 +222,6 @@ func (s *Executor) ExecuteTaskAndStreamResults(ctx context.Context, st *repb.Sch
 		}
 		resp := operation.ErrorResponse(finalErr)
 		md.WorkerCompletedTimestamp = timestamppb.Now()
-		if err := appendAuxiliaryMetadata(md, auxMetadata); err != nil {
-			log.CtxErrorf(ctx, "Failed to append auxiliary metadata: %s", err)
-		}
 		resp.Result = &repb.ActionResult{
 			ExecutionMetadata: md,
 		}
@@ -233,6 +230,9 @@ func (s *Executor) ExecuteTaskAndStreamResults(ctx context.Context, st *repb.Sch
 		}
 		return false, finalErr
 	}
+	if err := appendAuxiliaryMetadata(md, auxMetadata); err != nil {
+		return finishWithErrFn(status.InternalErrorf("append auxiliary metadata: %s", err))
+	}
 
 	stage := &stagedGauge{estimatedSize: md.EstimatedTaskSize}
 	defer stage.End()
@@ -397,9 +397,6 @@ func (s *Executor) ExecuteTaskAndStreamResults(ctx context.Context, st *repb.Sch
 	}
 	md.OutputUploadCompletedTimestamp = timestamppb.Now()
 	md.WorkerCompletedTimestamp = timestamppb.Now()
-	if err := appendAuxiliaryMetadata(md, auxMetadata); err != nil {
-		return finishWithErrFn(status.InternalErrorf("append auxiliary metadata: %s", err))
-	}
 	actionResult.ExecutionMetadata = md
 
 	// If the action failed or do_not_cache is set, upload information about the error via a failed