commit ca06fa26b82ea6a8cf490329177ec6b691ea4e6e
author Nathan Harmata <nharmata@google.com> Mon Jul 27 19:54:14 2015 +0000
committer Laszlo Csomor <laszlocsomor@google.com> Tue Jul 28 07:52:27 2015 +0000
tree d23f279e3461714a721bcfc62fad13a9b4b93a37
parent 8f565581cdada9ba7efcd4d42405b8d5635f6fb3

When encountering an unrecoverable IO error during pre-execution-phase work use the more appropriate and correct ExecutorInitException than ViewCreationException. Importantly, note that ExecutorInitException will give us the right exit code and since it's a subclass of AbruptExitException we get the right build status codes too.

--
MOS_MIGRATED_REVID=99208200

src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java

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 41256d4..fbe4140 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
@@ -59,7 +59,6 @@
 import com.google.devtools.build.lib.analysis.TopLevelArtifactContext;
 import com.google.devtools.build.lib.analysis.TopLevelArtifactHelper;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
-import com.google.devtools.build.lib.analysis.ViewCreationFailedException;
 import com.google.devtools.build.lib.analysis.WorkspaceStatusAction;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection;
@@ -339,8 +338,7 @@
       BuildResult buildResult, @Nullable SkyframeExecutor skyframeExecutor,
       BuildConfigurationCollection configurations,
       ImmutableMap<PathFragment, Path> packageRoots)
-      throws BuildFailedException, InterruptedException, AbruptExitException, TestExecException,
-      ViewCreationFailedException {
+      throws BuildFailedException, InterruptedException, TestExecException, AbruptExitException {
     Stopwatch timer = Stopwatch.createStarted();
     prepare(packageRoots, configurations);
 
@@ -478,8 +476,7 @@
   }
 
   private void prepare(ImmutableMap<PathFragment, Path> packageRoots,
-      BuildConfigurationCollection configurations)
-      throws ViewCreationFailedException {
+      BuildConfigurationCollection configurations) throws ExecutorInitException {
     // Prepare for build.
     Profiler.instance().markPhase(ProfilePhase.PREPARE);
 
@@ -494,13 +491,12 @@
     try {
       runtime.getBinTools().setupBuildTools();
     } catch (ExecException e) {
-      throw new ExecutorInitException("Tools symlink creation failed: "
-          + e.getMessage() + "; build aborted", e);
+      throw new ExecutorInitException("Tools symlink creation failed", e);
     }
   }
 
   private void plantSymlinkForest(ImmutableMap<PathFragment, Path> packageRoots,
-      BuildConfigurationCollection configurations) throws ViewCreationFailedException {
+      BuildConfigurationCollection configurations) throws ExecutorInitException {
     try {
       FileSystemUtils.deleteTreesBelowNotPrefixed(getExecRoot(),
           new String[] { ".", "_", Constants.PRODUCT_NAME + "-"});
@@ -510,28 +506,26 @@
       }
       FileSystemUtils.plantLinkForest(packageRoots, getExecRoot());
     } catch (IOException e) {
-      throw new ViewCreationFailedException("Source forest creation failed: " + e.getMessage()
-          + "; build aborted", e);
+      throw new ExecutorInitException("Source forest creation failed", e);
     }
   }
 
-  private void createActionLogDirectory() throws ViewCreationFailedException {
+  private void createActionLogDirectory() throws ExecutorInitException {
     Path directory = runtime.getDirectories().getActionConsoleOutputDirectory();
     try {
       if (directory.exists()) {
         FileSystemUtils.deleteTree(directory);
       }
       directory.createDirectory();
-    } catch (IOException ex) {
-      throw new ViewCreationFailedException("couldn't delete action output directory: " +
-          ex.getMessage());
+    } catch (IOException e) {
+      throw new ExecutorInitException("Couldn't delete action output directory", e);
     }
   }
 
   /**
    * Prepare for a local output build.
    */
-  private void startLocalOutputBuild() throws BuildFailedException {
+  private void startLocalOutputBuild() throws ExecutorInitException {
     long startTime = Profiler.nanoTimeMaybe();
 
     try {
@@ -539,15 +533,17 @@
       Path localOutputPath = runtime.getDirectories().getLocalOutputPath();
 
       if (outputPath.isSymbolicLink()) {
-        // Remove the existing symlink first.
-        outputPath.delete();
-        if (localOutputPath.exists()) {
-          // Pre-existing local output directory. Move to outputPath.
-          localOutputPath.renameTo(outputPath);
+        try {
+          // Remove the existing symlink first.
+          outputPath.delete();
+          if (localOutputPath.exists()) {
+            // Pre-existing local output directory. Move to outputPath.
+            localOutputPath.renameTo(outputPath);
+          }
+        } catch (IOException e) {
+          throw new ExecutorInitException("Couldn't handle local output directory symlinks", e);
         }
       }
-    } catch (IOException e) {
-      throw new BuildFailedException(e.getMessage());
     } finally {
       Profiler.instance().logSimpleTask(startTime, ProfilerTask.INFO,
           "Starting local output build");