download_file: use tempfile::Builder to avoid name collisions #5296
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
Increase number of concurrent operations to catch race conditions with greater probability.
generall
approved these changes
Oct 23, 2024
timvisee
pushed a commit
that referenced
this pull request
Nov 8, 2024
* download_file: use `tempfile::Builder` to avoid name collisions * _do_recover_from_snapshot: follow the same pattern as in recover_shard_snapshot * tests/shard-snapshot-api.sh: PARALLEL=2 -> PARALLEL=10 Increase number of concurrent operations to catch race conditions with greater probability.
Merged
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.
Fixup for #5227.
The PR #5227 introduced a new flaky CI failure (example log).
The cause is this change after which the filename of a temporary download file became deterministic.
Before 5227:
./snapshots/tmp/download-{random}/{filename}.After: 5227:
./snapshots/tmp/{filename}.The CI test
recover-remote-concurrenttriggers a race condition because it tries to upload and restore multiple snapshots with the same name simultaneously.There are two possible ways to fix that:
recover_shard_snapshotto usesnapshots_download_tempdir(a random directory inside./snapshots/tmp).download_file()function to use random filename (viatempfile::Builder()) instead of deterministic user-provided filename (viatempfile::TempPath::from_path()).In this PR I took the second approach as I find it more clean.
The new temp file would be named like this:
./snapshots/tmp/{filename}-{random}.download.Additionally, this PR updates the test to spawn 10 concurrent operations instead of 2 to increase the chance of catching this condition again.