mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-10-29 19:17:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid removing entries during read_dir (#7151)

Browse source 
I think this is the source of the test flakiness.
This commit is contained in:
Charlie Marsh 2024-09-06 22:10:28 -04:00 • committed by GitHub
parent 7d49fbc753
commit 6179b65e37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/uv-distribution/src/source/mod.rs
View file

@ -1620,19 +1620,18 @@ pub fn prune(cache: &Cache) -> Result<Removal, Error> {
for entry in walkdir::WalkDir::new(bucket) {
let entry = entry.map_err(Error::CacheWalk)?;
if !entry.file_type().is_dir() {
continue;
}
// If we find a `revision.http` file, read the pointer, and remove any extraneous
// directories.
if entry.file_name() == "revision.http" {
let pointer = HttpRevisionPointer::read_from(entry.path())?;
let revision = entry.path().join("revision.http");
if revision.is_file() {
let pointer = HttpRevisionPointer::read_from(revision)?;
if let Some(pointer) = pointer {
// Remove all sibling directories that are not referenced by the pointer.
for sibling in entry
.path()
.parent()
.unwrap()
.read_dir()
.map_err(Error::CacheRead)?
{
for sibling in entry.path().read_dir().map_err(Error::CacheRead)? {
let sibling = sibling.map_err(Error::CacheRead)?;
if sibling.file_type().map_err(Error::CacheRead)?.is_dir() {
let sibling_name = sibling.file_name();
@ -1647,21 +1646,18 @@ pub fn prune(cache: &Cache) -> Result<Removal, Error> {
}
}
}
continue;
}
// If we find a `revision.rev` file, read the pointer, and remove any extraneous
// directories.
if entry.file_name() == "revision.rev" {
let pointer = LocalRevisionPointer::read_from(entry.path())?;
let revision = entry.path().join("revision.rev");
if revision.is_file() {
let pointer = LocalRevisionPointer::read_from(revision)?;
if let Some(pointer) = pointer {
// Remove all sibling directories that are not referenced by the pointer.
for sibling in entry
.path()
.parent()
.unwrap()
.read_dir()
.map_err(Error::CacheRead)?
{
for sibling in entry.path().read_dir().map_err(Error::CacheRead)? {
let sibling = sibling.map_err(Error::CacheRead)?;
if sibling.file_type().map_err(Error::CacheRead)?.is_dir() {
let sibling_name = sibling.file_name();
@ -1676,6 +1672,8 @@ pub fn prune(cache: &Cache) -> Result<Removal, Error> {
}
}
}
continue;
}
}
}