Skip to content

Avoid two stats for non-directory symlinks created remotely #25986

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
fmeum wants to merge 1 commit into from
+12 −5
Closed

Avoid two stats for non-directory symlinks created remotely #25986

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
17 changes: 12 additions & 5 deletions src/main/java/com/google/devtools/build/lib/remote/RemoteExecutionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,13 +1015,20 @@ private void createSymlinks(Iterable<SymlinkMetadata> symlinks) throws IOExcepti
"Failed creating directory and parents for %s",
symlink.path())
.createDirectoryAndParents();
// If a directory output is being materialized as a symlink, we must first delete the
// preexisting empty directory.
if (symlink.path().exists(Symlinks.NOFOLLOW)
&& symlink.path().isDirectory(Symlinks.NOFOLLOW)) {
// If a directory output is being materialized as a symlink, creating the symlink fails as we
// must first delete the preexisting empty directory. Since this is rare (and in the future
// BwoB may no longer eagerly create these directories), we don't delete the directory
Copy link
Collaborator Author

@fmeum fmeum May 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This refers to #25976. I can update the comment depending on which PR is merged first.

Copy link
Contributor

@tjgq tjgq May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's get #25976 merged first (it needs a rebase).

Copy link
Contributor

@tjgq tjgq May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving since #25976 can't yet be merged.

// beforehand.
try {
symlink.path().createSymbolicLink(symlink.target());
} catch (IOException e) {
if (!symlink.path().isDirectory(Symlinks.NOFOLLOW)) {
throw e;
}
// Retry after deleting the directory.
symlink.path().delete();
symlink.path().createSymbolicLink(symlink.target());
}
symlink.path().createSymbolicLink(symlink.target());
}
}

Expand Down
Loading