commit ac023bbcb127884e2c14c5c70848c61f149dfbbe
author Janak Ramakrishnan <janakr@google.com> Tue Sep 15 19:37:11 2015 +0000
committer Florian Weikert <fwe@google.com> Wed Sep 16 10:17:38 2015 +0000
tree 1a0cfc96e4fe1209fe3fc36535f45936823df44d
parent fe87155b7154f7ef64c7ab095071b148980f035f

Get rid of transient errors during preprocessing and throw IOExceptions instead. Transient errors were only detected on IOExceptions, but preprocessing doesn't actually throw IOExceptions except if it fails before it even opens the main file, so there's no sense in trying to construct a package in that case.

--
MOS_MIGRATED_REVID=103119445

src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
index 95fef27..2de3167 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
@@ -800,9 +800,22 @@
             packageId, packageLocator);
         Preprocessor.Result preprocessingResult = preprocessCache.getIfPresent(packageId);
         if (preprocessingResult == null) {
-          preprocessingResult = replacementSource == null
-              ? packageFactory.preprocess(packageId, buildFilePath, inputSource, globber)
-              : Preprocessor.Result.noPreprocessing(replacementSource);
+          try {
+            preprocessingResult =
+                replacementSource == null
+                    ? packageFactory.preprocess(packageId, inputSource, globber)
+                    : Preprocessor.Result.noPreprocessing(replacementSource);
+          } catch (IOException e) {
+            env
+                .getListener()
+                .handle(
+                    Event.error(
+                        Location.fromFile(buildFilePath),
+                        "preprocessing failed: " + e.getMessage()));
+            throw new PackageFunctionException(
+                new BuildFileContainsErrorsException(packageId, "preprocessing failed", e),
+                Transience.TRANSIENT);
+          }
           preprocessCache.put(packageId, preprocessingResult);
         }