Give OutputService#startBuild() access to the build ID.

--
MOS_MIGRATED_REVID=92288707

3 files changed, 11 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
index f7fc0f8b2c..9bc40fb2ca 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
@@ -199,8 +199,9 @@ public class BuildTool {
 
       // Execution phase.
       if (needsExecutionPhase(request.getBuildOptions())) {
-        executionTool.executeBuild(analysisResult, result, runtime.getSkyframeExecutor(),
-            configurations, mergePackageRoots(loadingResult.getPackageRoots(),
+        executionTool.executeBuild(request.getId(), analysisResult, result,
+            runtime.getSkyframeExecutor(), configurations,
+            mergePackageRoots(loadingResult.getPackageRoots(),
             runtime.getSkyframeExecutor().getPackageRoots()));
       }
 
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index 8051a0cb52..be3341c1f9 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -105,6 +105,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -290,14 +291,14 @@ public class ExecutionTool {
    * Performs the execution phase (phase 3) of the build, in which the Builder
    * is applied to the action graph to bring the targets up to date. (This
    * function will return prior to execution-proper if --nobuild was specified.)
-   *
+   * @param buildId UUID of the build id
    * @param analysisResult the analysis phase output
    * @param buildResult the mutable build result
    * @param skyframeExecutor the skyframe executor (if any)
    * @param packageRoots package roots collected from loading phase and BuildConfigutaionCollection
    * creation
    */
-  void executeBuild(AnalysisResult analysisResult,
+  void executeBuild(UUID buildId, AnalysisResult analysisResult,
       BuildResult buildResult, @Nullable SkyframeExecutor skyframeExecutor,
       BuildConfigurationCollection configurations,
       ImmutableMap<PathFragment, Path> packageRoots)
@@ -329,7 +330,7 @@ public class ExecutionTool {
 
     OutputService outputService = runtime.getOutputService();
     if (outputService != null) {
-      outputService.startBuild();
+      outputService.startBuild(buildId);
     } else {
       startLocalOutputBuild(); // TODO(bazel-team): this could be just another OutputService
     }
diff --git a/src/main/java/com/google/devtools/build/lib/exec/OutputService.java b/src/main/java/com/google/devtools/build/lib/exec/OutputService.java
index 88d9b942b7..31ef5ef95a 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/OutputService.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/OutputService.java
@@ -23,6 +23,7 @@ import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 
 import java.io.IOException;
+import java.util.UUID;
 
 /**
  * An OutputService retains control over the Blaze output tree, and provides a higher level of
@@ -51,10 +52,12 @@ public interface OutputService {
   /**
    * Start the build.
    *
+   * @param buildId the UUID build identifier
    * @throws BuildFailedException if build preparation failed
    * @throws InterruptedException
    */
-  void startBuild() throws BuildFailedException, AbruptExitException, InterruptedException;
+  void startBuild(UUID buildId)
+      throws BuildFailedException, AbruptExitException, InterruptedException;
 
   /**
    * Finish the build.