mirror of
https://github.com/astral-sh/uv.git
synced 2025-11-26 22:04:29 +00:00
Guard against concurrent cache writes on Windows (#11007)
## Summary On Windows, we have a lot of issues with atomic replacement and such. There are a bunch of different failure modes, but they generally involve: trying to persist a fail to a path at which the file already exists, trying to replace or remove a file while someone else is reading it, etc. This PR adds locks to all of the relevant database paths. We already use these advisory locks when building source distributions; now we use them when unzipping wheels, storing metadata, etc. Closes #11002. ## Test Plan I ran the following script: ```shell # Define the cache directory path $cacheDir = "C:\Users\crmar\workspace\uv\cache" # Clear the cache directory if it exists if (Test-Path $cacheDir) { Remove-Item -Recurse -Force $cacheDir } # Create the cache directory again New-Item -ItemType Directory -Force -Path $cacheDir # Define the command to run with --cache-dir flag $command = { param ($venvPath) # Create a virtual environment in the specified path with --python uv venv $venvPath # Run the pip install command with --cache-dir flag C:\Users\crmar\workspace\uv\target\profiling\uv.exe pip install flask==1.0.4 --no-binary flask --cache-dir C:\Users\crmar\workspace\uv\cache -v --python $venvPath } # Define the paths for the different virtual environments $venv1 = "C:\Users\crmar\workspace\uv\venv1" $venv2 = "C:\Users\crmar\workspace\uv\venv2" $venv3 = "C:\Users\crmar\workspace\uv\venv3" $venv4 = "C:\Users\crmar\workspace\uv\venv4" $venv5 = "C:\Users\crmar\workspace\uv\venv5" # Start the command in parallel five times using Start-Job, each with a different venv $job1 = Start-Job -ScriptBlock $command -ArgumentList $venv1 $job2 = Start-Job -ScriptBlock $command -ArgumentList $venv2 $job3 = Start-Job -ScriptBlock $command -ArgumentList $venv3 $job4 = Start-Job -ScriptBlock $command -ArgumentList $venv4 $job5 = Start-Job -ScriptBlock $command -ArgumentList $venv5 # Wait for all jobs to complete $jobs = @($job1, $job2, $job3, $job4, $job5) $jobs | ForEach-Object { Wait-Job $_ } # Retrieve the results (optional) $jobs | ForEach-Object { Receive-Job -Job $_ } # Clean up the jobs $jobs | ForEach-Object { Remove-Job -Job $_ } ``` And ensured it succeeded in five straight invocations (whereas on `main`, it consistently fails with a variety of different traces).
This commit is contained in:
parent
321f8ccf45
commit
f1840c77b6
7 changed files with 137 additions and 71 deletions
|
|
@ -336,6 +336,13 @@ impl RegistryClient {
|
|||
Connectivity::Offline => CacheControl::AllowStale,
|
||||
};
|
||||
|
||||
// Acquire an advisory lock, to guard against concurrent writes.
|
||||
#[cfg(windows)]
|
||||
let _lock = {
|
||||
let lock_entry = cache_entry.with_file(format!("{package_name}.lock"));
|
||||
lock_entry.lock().await.map_err(ErrorKind::CacheWrite)?
|
||||
};
|
||||
|
||||
let result = if matches!(index, IndexUrl::Path(_)) {
|
||||
self.fetch_local_index(package_name, &url).await
|
||||
} else {
|
||||
|
|
@ -614,6 +621,13 @@ impl RegistryClient {
|
|||
Connectivity::Offline => CacheControl::AllowStale,
|
||||
};
|
||||
|
||||
// Acquire an advisory lock, to guard against concurrent writes.
|
||||
#[cfg(windows)]
|
||||
let _lock = {
|
||||
let lock_entry = cache_entry.with_file(format!("{}.lock", filename.stem()));
|
||||
lock_entry.lock().await.map_err(ErrorKind::CacheWrite)?
|
||||
};
|
||||
|
||||
let response_callback = |response: Response| async {
|
||||
let bytes = response
|
||||
.bytes()
|
||||
|
|
@ -677,6 +691,13 @@ impl RegistryClient {
|
|||
Connectivity::Offline => CacheControl::AllowStale,
|
||||
};
|
||||
|
||||
// Acquire an advisory lock, to guard against concurrent writes.
|
||||
#[cfg(windows)]
|
||||
let _lock = {
|
||||
let lock_entry = cache_entry.with_file(format!("{}.lock", filename.stem()));
|
||||
lock_entry.lock().await.map_err(ErrorKind::CacheWrite)?
|
||||
};
|
||||
|
||||
// Attempt to fetch via a range request.
|
||||
if index.map_or(true, |index| capabilities.supports_range_requests(index)) {
|
||||
let req = self
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue