Unconditionally shut down the execution tool, even after catastrophes.
RELNOTES: None.
@@ -261,16 +261,15 @@ public final class BuildTool {
catastrophe = true;
throw e;
} finally {
+ if (executionTool != null) {
+ executionTool.shutdown();
+ }
if (!catastrophe) {
// Delete dirty nodes to ensure that they do not accumulate indefinitely.
long versionWindow = request.getViewOptions().versionWindowForDirtyNodeGc;
if (versionWindow != -1) {
env.getSkyframeExecutor().deleteOldNodes(versionWindow);
}
-
- if (executionTool != null) {
- executionTool.shutdown();
- }
// The workspace status actions will not run with certain flags, or if an error
// occurs early in the build. Tell a lie so that the event is not missing.
// If multiple build_info events are sent, only the first is kept, so this does not harm
