forked from bazelbuild/bazel
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Don't crash when loading a non-existent exec transition .bzl file.
i.e. `$ bazel build //foo --experimental_exec_config=//bar/does_not_exist.bzl%my_transition` This is a small change but has lots of files because I had to move `BzlLoadFailedException` into its own class. So a lot of simple reference updates. Details: - `StarlarkExecTransitionLoader` is responsible for loading the exec transition. - It delegates to `BzlLoadFunction` to load the `bzl` file. - I need `StarlarkExecTransitionLoader` to anticipate `BzlLoadFailedException`. - I moved `BzlLoadFailedException` out of `BzlLoadFunction` to avoid a build dependency cycle: `BzlLoadFunction` is part of the catch-call `:skyframe_cluster` library, which itself depends on `StarlarkExecTransitionLoader`. - Kept a bunch of static `BzlLoadFailedException` instantiators in `BzlLoadFunction`. Many of these involve higher order types with the same dependency issues. - Updated the `BzlFileLoader` interface (which wraps `BzlLoadFunction` calls) to throw `BzlLoadFailedException`. - Updated `BzlFileLoader` implementations to check for that exception when Skyframe-evaluating. - Uncommented the test checking this functionality. PiperOrigin-RevId: 585800246 Change-Id: I71921380a658eb6c441b2600f0758049162f85c0
- Loading branch information
1 parent
2454812
commit b2cca31
Showing
21 changed files
with
137 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadFailedException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // Copyright 2023 The Bazel Authors. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| package com.google.devtools.build.lib.skyframe; | ||
|
|
||
| import com.google.devtools.build.lib.server.FailureDetails.FailureDetail; | ||
| import com.google.devtools.build.lib.server.FailureDetails.StarlarkLoading; | ||
| import com.google.devtools.build.lib.server.FailureDetails.StarlarkLoading.Code; | ||
| import com.google.devtools.build.lib.util.DetailedExitCode; | ||
| import com.google.devtools.build.skyframe.SkyFunctionException.Transience; | ||
|
|
||
| /** Exceptions from {@link BzlLoadFunction}. */ | ||
| public final class BzlLoadFailedException extends Exception implements SaneAnalysisException { | ||
| private final Transience transience; | ||
| private final DetailedExitCode detailedExitCode; | ||
|
|
||
| private BzlLoadFailedException( | ||
| String errorMessage, DetailedExitCode detailedExitCode, Transience transience) { | ||
| super(errorMessage); | ||
| this.transience = transience; | ||
| this.detailedExitCode = detailedExitCode; | ||
| } | ||
|
|
||
| BzlLoadFailedException(String errorMessage, DetailedExitCode detailedExitCode) { | ||
| this(errorMessage, detailedExitCode, Transience.PERSISTENT); | ||
| } | ||
|
|
||
| BzlLoadFailedException( | ||
| String errorMessage, | ||
| DetailedExitCode detailedExitCode, | ||
| Exception cause, | ||
| Transience transience) { | ||
| super(errorMessage, cause); | ||
| this.transience = transience; | ||
| this.detailedExitCode = detailedExitCode; | ||
| } | ||
|
|
||
| BzlLoadFailedException(String errorMessage, Code code) { | ||
| this(errorMessage, createDetailedExitCode(errorMessage, code), Transience.PERSISTENT); | ||
| } | ||
|
|
||
| BzlLoadFailedException(String errorMessage, Code code, Exception cause, Transience transience) { | ||
| this(errorMessage, createDetailedExitCode(errorMessage, code), cause, transience); | ||
| } | ||
|
|
||
| Transience getTransience() { | ||
| return transience; | ||
| } | ||
|
|
||
| @Override | ||
| public DetailedExitCode getDetailedExitCode() { | ||
| return detailedExitCode; | ||
| } | ||
|
|
||
| static DetailedExitCode createDetailedExitCode(String message, Code code) { | ||
| return DetailedExitCode.of( | ||
| FailureDetail.newBuilder() | ||
| .setMessage(message) | ||
| .setStarlarkLoading(StarlarkLoading.newBuilder().setCode(code)) | ||
| .build()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.