Fix --venv mode short link creation.
#1505
Merged
Conversation
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
Previously this was non-atomic which would lead to artificial short link creation collisions for venvs that consistently failed to populate. Fixes pex-tool#1504
jsirois
commented
Nov 1, 2021
| raise RuntimeError( | ||
| "The venv for {pex} at {venv} has hash collisions with {count} other " | ||
| "{venvs}!\n{collisions}".format( | ||
| short_venv_dir = os.path.join(pex_info.pex_root, "venvs", "s", entropy) |
There was a problem hiding this comment.
The GitHub diff UI is pretty bad. The only change here is to use a nested atomic_directory with if short_venv.is_finalized; continue being the new collision detection mechanism that was previously performed by an eager os.symlink in a try / except. To effect this change, instead of the structure PEX_ROOT/venvs/short/<short hash> -> <real venv> the structure becomes PEX_ROOT/venvs/s/<short hash>/venv -> <real venv>. Notably, 'short/' is replaced with 's/venv/'; so we only gain 1 character for the short links.
benjyw
approved these changes
Nov 1, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously this was non-atomic which would lead to artificial short link
creation collisions for venvs that consistently failed to populate.
Fixes #1504