From bf98f39d5d69d14d74dad79e705f76966f348766 Mon Sep 17 00:00:00 2001 From: Nathan Harmata Date: Thu, 7 Jan 2016 22:58:29 +0000 Subject: Add the ability to customize the bazel client's exit code used when the bazel server exits abruptly. -- MOS_MIGRATED_REVID=111641619 --- .../java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | 3 ++- src/main/java/com/google/devtools/build/skyframe/BuildDriver.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools') diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index f142e75863..20b3777fe2 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java @@ -1459,7 +1459,8 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { * Get metadata related to the prepareAndGet() lookup. Resulting data is specific to the * underlying evaluation implementation. */ - public String prepareAndGetMetadata(Collection patterns, String offset) { + public String prepareAndGetMetadata(Collection patterns, String offset) + throws AbruptExitException, InterruptedException { return buildDriver.meta(ImmutableList.of(getUniverseKey(patterns, offset))); } diff --git a/src/main/java/com/google/devtools/build/skyframe/BuildDriver.java b/src/main/java/com/google/devtools/build/skyframe/BuildDriver.java index 129238b4d9..a63afc71d8 100644 --- a/src/main/java/com/google/devtools/build/skyframe/BuildDriver.java +++ b/src/main/java/com/google/devtools/build/skyframe/BuildDriver.java @@ -15,6 +15,7 @@ package com.google.devtools.build.skyframe; import com.google.devtools.build.lib.events.EventHandler; +import com.google.devtools.build.lib.util.AbruptExitException; import javax.annotation.Nullable; @@ -34,7 +35,7 @@ public interface BuildDriver { * Retrieve metadata about the computation over the given roots. Data returned is specific to the * underlying evaluator implementation. */ - String meta(Iterable roots); + String meta(Iterable roots) throws AbruptExitException, InterruptedException; MemoizingEvaluator getGraphForTesting(); -- cgit v1.2.3