-
Notifications
You must be signed in to change notification settings - Fork 4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remote: Add --experimental_capture_corrupted_outputs flag. #13568
Closed
Closed
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
60 changes: 60 additions & 0 deletions
60
src/main/java/com/google/devtools/build/lib/remote/common/OutputDigestMismatchException.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,60 @@ | ||
| // Copyright 2021 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.remote.common; | ||
|
|
||
| import build.bazel.remote.execution.v2.Digest; | ||
| import com.google.devtools.build.lib.vfs.Path; | ||
| import java.io.IOException; | ||
|
|
||
| /** An exception to indicate the digest of downloaded output does not match the expected value. */ | ||
| public class OutputDigestMismatchException extends IOException { | ||
| private final Digest expected; | ||
| private final Digest actual; | ||
|
|
||
| private Path localPath; | ||
| private String outputPath; | ||
|
|
||
| public OutputDigestMismatchException(Digest expected, Digest actual) { | ||
| this.expected = expected; | ||
| this.actual = actual; | ||
| } | ||
|
|
||
| public void setOutputPath(String outputPath) { | ||
| this.outputPath = outputPath; | ||
| } | ||
|
|
||
| public String getOutputPath() { | ||
| return outputPath; | ||
| } | ||
|
|
||
| public Path getLocalPath() { | ||
| return localPath; | ||
| } | ||
|
|
||
| public void setLocalPath(Path localPath) { | ||
| this.localPath = localPath; | ||
| } | ||
|
|
||
| @Override | ||
| public String getMessage() { | ||
| return String.format( | ||
| "Output %s download failed: Expected digest '%s/%d' does not match " | ||
| + "received digest '%s/%d'.", | ||
| outputPath, | ||
| expected.getHash(), | ||
| expected.getSizeBytes(), | ||
| actual.getHash(), | ||
| actual.getSizeBytes()); | ||
| } | ||
| } |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it guaranteed (even with broken or malicious backends) that the output path will never contain
..references or start with a/? Should we check that the resulting pathdstis still below thecaptureCorruptedOutputsDirjust to make sure? 🤔There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are safe here since
outputPathis what we obtained from skyframe and send to remote execution backend (something likebazel-out/darwin-fastbuild/bin/...).It is a path relative to the working directory (or input root depends on the flags) when the remote backend executing the action.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
However, I added the check in case the invariance changed in the future. Thanks for the catch!