Allow Skyframe graph lookups and value retrievals to throw InterruptedException.

The only place we now don't handle InterruptedException is in the action graph created after analysis, since I'm not sure that will be around for that much longer.

--
MOS_MIGRATED_REVID=130327770

2 files changed, 6 insertions, 11 deletions

diff --git a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/GenerateWorkspace.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/GenerateWorkspace.java
index 164742a162..8cea85b150 100644
--- a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/GenerateWorkspace.java
+++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/GenerateWorkspace.java
@@ -27,7 +27,6 @@ import com.google.devtools.build.lib.vfs.UnixFileSystem;
 import com.google.devtools.build.workspace.maven.DefaultModelResolver;
 import com.google.devtools.build.workspace.maven.Resolver;
 import com.google.devtools.common.options.OptionsParser;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -48,7 +47,7 @@ public class GenerateWorkspace {
   private final List<String> inputs;
   private final Path outputDir;
 
-  public static void main(String[] args) {
+  public static void main(String[] args) throws InterruptedException {
     OptionsParser parser = OptionsParser.newOptionsParser(GenerateWorkspaceOptions.class);
     parser.parseAndExitUponError(args);
     GenerateWorkspaceOptions options = parser.getOptions(GenerateWorkspaceOptions.class);
@@ -99,7 +98,7 @@ public class GenerateWorkspace {
         ? new JavaIoFileSystem() : new UnixFileSystem();
   }
 
-  private void generateFromWorkspace(List<String> projects) {
+  private void generateFromWorkspace(List<String> projects) throws InterruptedException {
     for (String project : projects) {
       WorkspaceResolver workspaceResolver = new WorkspaceResolver(resolver, handler);
       Path projectPath = fileSystem.getPath(getAbsolute(project)).getRelative("WORKSPACE");
diff --git a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/WorkspaceResolver.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/WorkspaceResolver.java
index 2ad60eef33..736469f095 100644
--- a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/WorkspaceResolver.java
+++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/WorkspaceResolver.java
@@ -41,12 +41,10 @@ import com.google.devtools.build.workspace.maven.DefaultModelResolver;
 import com.google.devtools.build.workspace.maven.Resolver;
 import com.google.devtools.build.workspace.maven.Resolver.InvalidArtifactCoordinateException;
 import com.google.devtools.build.workspace.maven.Rule;
-
-import org.apache.maven.model.building.ModelSource;
-import org.apache.maven.model.resolution.UnresolvableModelException;
-
 import java.io.IOException;
 import java.util.List;
+import org.apache.maven.model.building.ModelSource;
+import org.apache.maven.model.resolution.UnresolvableModelException;
 
 /**
  * Finds the transitive dependencies of a WORKSPACE file.
@@ -73,10 +71,8 @@ public class WorkspaceResolver {
     this.environmentExtensions = environmentExtensions.build();
   }
 
-  /**
-   * Converts the WORKSPACE file content into an ExternalPackage.
-   */
-  public Package parse(Path workspacePath) {
+  /** Converts the WORKSPACE file content into an ExternalPackage. */
+  public Package parse(Path workspacePath) throws InterruptedException {
     Package.Builder builder = Package.newExternalPackageBuilder(
         Package.Builder.DefaultHelper.INSTANCE,
         workspacePath,