Skip to content

[8.8.0] Compare paths as fragments in AbstractActionInputPrefetcher… #30680

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.

Sign up for GitHub

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

Closed
iancha1992 wants to merge 1 commit into from
+3 −9
Closed

[8.8.0] Compare paths as fragments in AbstractActionInputPrefetcher… #30680

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,9 @@ void setPermanentlyWritable(Path dir) throws IOException {
}

private void setWritable(Path dir, DirectoryState newState) throws IOException {
// External repo paths (which live directly under the output base) are not build outputs and
// don't need output permission management. Check this first (comparing fragments, since the
// dir may be on the host file system while the output base is on an overlay) so that the exec
// root, which is only resolvable during the loading phase and later, is not resolved during
// external repo materialization.
if (dir.asFragment()
.startsWith(
outputBase.getRelative(LabelConstants.EXTERNAL_REPOSITORY_LOCATION).asFragment())
|| !dir.startsWith(execRoot())) {
// Compare as fragments since execRoot may be located on a file system overlaying the host
// file system where downloads are written to.
if (!dir.asFragment().startsWith(execRoot.asFragment())) {
return;
}
AtomicReference<IOException> caughtException = new AtomicReference<>();
Expand Down
Loading