Skip to content
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

move builder temp-dir to prefix to avoid conflicts with second builder #2263

Merged
merged 1 commit into from
Oct 13, 2023

Conversation

syphar
Copy link
Member

@syphar syphar commented Oct 11, 2023

in our builder we are using tempfile::tempdir with a prefix to store temporary files from the build.

Due to how the tempfile crate works, this in itself won't lead to any issues when running multiple builders.

But after #808 (and #1553 / #1586 ) we started cleaning directories with the same prefix, from both builders, which lead to silently deleting temporary files from other builders, and loudly failing when trying to cleanup ( see this sentry error).

This PR makes the tempdir a subdirectory of Config.prefix, which IMO is easier to reason with.

@syphar
Copy link
Member Author

syphar commented Oct 11, 2023

r? @Nemo157

@github-actions github-actions bot added the S-waiting-on-review Status: This pull request has been implemented and needs to be reviewed label Oct 11, 2023
src/config.rs Outdated Show resolved Hide resolved
@syphar syphar force-pushed the separate-build-temp-directories branch from a0d9991 to a6a5413 Compare October 12, 2023 16:17
@syphar syphar requested a review from Nemo157 October 12, 2023 16:18
@syphar syphar force-pushed the separate-build-temp-directories branch from a6a5413 to dc5749b Compare October 12, 2023 21:53
Copy link
Member

@Nemo157 Nemo157 left a comment

Choose a reason for hiding this comment

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

smh

@syphar syphar merged commit 1aa27bf into rust-lang:master Oct 13, 2023
7 checks passed
@syphar syphar deleted the separate-build-temp-directories branch October 13, 2023 05:21
@github-actions github-actions bot added S-waiting-on-deploy This PR is ready to be merged, but is waiting for an admin to have time to deploy it and removed S-waiting-on-review Status: This pull request has been implemented and needs to be reviewed labels Oct 13, 2023
@syphar syphar removed the S-waiting-on-deploy This PR is ready to be merged, but is waiting for an admin to have time to deploy it label Oct 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants