Stop catching InterruptedException in remote execution.

If the user interrupts the build, they probably don't want local
fallback to happen.

Also clean up an unused method and parameter.

--
Change-Id: I6bf80fa110bbba911b0743f24c25240c208c98d1
Reviewed-on: https://bazel-review.googlesource.com/5470
MOS_MIGRATED_REVID=130612791

1 files changed, 5 insertions, 3 deletions

diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorker.java b/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorker.java
index 69d2716705..414737a810 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorker.java
+++ b/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorker.java
@@ -69,8 +69,7 @@ public class RemoteWorker extends RemoteWorkImplBase {
     Path tempRoot = workPath.getRelative("build-" + UUID.randomUUID().toString());
     try {
       FileSystemUtils.createDirectoryAndParents(tempRoot);
-      final ConcurrentMapActionCache actionCache =
-          new ConcurrentMapActionCache(tempRoot, remoteOptions, cache);
+      final ConcurrentMapActionCache actionCache = new ConcurrentMapActionCache(tempRoot, cache);
       final MemcacheWorkExecutor workExecutor =
           MemcacheWorkExecutor.createLocalWorkExecutor(actionCache, tempRoot);
       if (LOG_FINER) {
@@ -96,10 +95,13 @@ public class RemoteWorker extends RemoteWorkImplBase {
       } else {
         LOG.warning("Preserving work directory " + tempRoot.toString() + ".");
       }
-    } catch (IOException e) {
+    } catch (IOException | InterruptedException e) {
       RemoteWorkResponse.Builder response = RemoteWorkResponse.newBuilder();
       response.setSuccess(false).setOut("").setErr("").setException(e.toString());
       responseObserver.onNext(response.build());
+      if (e instanceof InterruptedException) {
+        Thread.currentThread().interrupt();
+      }
     } finally {
       responseObserver.onCompleted();
     }