Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
3606db59
Unverified
Commit
3606db59
authored
Dec 05, 2025
by
Niklas Mischkulnig
Committed by
GitHub
Dec 05, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turbopack: correctly overwrite existing symlinks (#86808)
parent
c112f8a2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
128 additions
and
1 deletion
+128
-1
lib.rs
turbopack/crates/turbo-tasks-fs/src/lib.rs
+128
-1
No files found.
turbopack/crates/turbo-tasks-fs/src/lib.rs
View file @
3606db59
...
@@ -1127,6 +1127,26 @@ impl FileSystem for DiskFileSystem {
...
@@ -1127,6 +1127,26 @@ impl FileSystem for DiskFileSystem {
PathBuf
::
from
(
unix_to_sys
(
target
)
.as_ref
())
PathBuf
::
from
(
unix_to_sys
(
target
)
.as_ref
())
};
};
let
full_path
=
full_path
.into_owned
();
let
full_path
=
full_path
.into_owned
();
if
old_content
.is_some
()
{
// Remove existing symlink before creating a new one. At least on Unix,
// symlink(2) fails with EEXIST if the link already exists instead of
// overwriting it
retry_blocking
(
full_path
.clone
(),
|
path
|
std
::
fs
::
remove_file
(
path
))
.concurrency_limited
(
&
inner
.write_semaphore
)
.await
.or_else
(|
err
|
{
if
err
.kind
()
==
ErrorKind
::
NotFound
{
Ok
(())
}
else
{
Err
(
err
)
}
})
.with_context
(||
{
anyhow!
(
"removing existing symlink {} failed"
,
full_path
.display
())
})
?
;
}
retry_blocking
(
target_path
,
move
|
target_path
|
{
retry_blocking
(
target_path
,
move
|
target_path
|
{
let
_span
=
tracing
::
info_span!
(
let
_span
=
tracing
::
info_span!
(
"write symlink"
,
"write symlink"
,
...
@@ -2915,7 +2935,114 @@ mod tests {
...
@@ -2915,7 +2935,114 @@ mod tests {
.unwrap
();
.unwrap
();
}
}
// Test helpers for denied_path tests
#[cfg(test)]
mod
symlink_tests
{
use
std
::{
fs
::{
File
,
create_dir_all
,
read_to_string
},
io
::
Write
,
};
use
turbo_rcstr
::{
RcStr
,
rcstr
};
use
turbo_tasks
::{
ResolvedVc
,
apply_effects
};
use
turbo_tasks_backend
::{
BackendOptions
,
TurboTasksBackend
,
noop_backing_storage
};
use
crate
::{
DiskFileSystem
,
FileSystem
,
FileSystemPath
,
LinkContent
,
LinkType
};
#[turbo_tasks
::
function(operation)]
async
fn
test_write_link_effect
(
fs
:
ResolvedVc
<
DiskFileSystem
>
,
path
:
FileSystemPath
,
target
:
RcStr
,
)
->
anyhow
::
Result
<
()
>
{
let
write_file
=
|
f
|
{
fs
.write_link
(
f
,
LinkContent
::
Link
{
target
:
format!
(
"{target}/data.txt"
)
.into
(),
link_type
:
LinkType
::
empty
(),
}
.cell
(),
)
};
// Write it twice (same content)
write_file
(
path
.join
(
"symlink-file"
)
?
)
.await
?
;
write_file
(
path
.join
(
"symlink-file"
)
?
)
.await
?
;
let
write_dir
=
|
f
|
{
fs
.write_link
(
f
,
LinkContent
::
Link
{
target
:
target
.clone
(),
link_type
:
LinkType
::
DIRECTORY
,
}
.cell
(),
)
};
// Write it twice (same content)
write_dir
(
path
.join
(
"symlink-dir"
)
?
)
.await
?
;
write_dir
(
path
.join
(
"symlink-dir"
)
?
)
.await
?
;
Ok
(())
}
#[tokio
::
test(flavor
=
"multi_thread"
,
worker_threads
=
2
)]
async
fn
test_write_link
()
{
let
scratch
=
tempfile
::
tempdir
()
.unwrap
();
let
path
=
scratch
.path
()
.to_owned
();
create_dir_all
(
path
.join
(
"subdir-a"
))
.unwrap
();
File
::
create_new
(
path
.join
(
"subdir-a/data.txt"
))
.unwrap
()
.write_all
(
b
"foo"
)
.unwrap
();
create_dir_all
(
path
.join
(
"subdir-b"
))
.unwrap
();
File
::
create_new
(
path
.join
(
"subdir-b/data.txt"
))
.unwrap
()
.write_all
(
b
"bar"
)
.unwrap
();
let
root
=
path
.to_str
()
.unwrap
()
.into
();
let
tt
=
turbo_tasks
::
TurboTasks
::
new
(
TurboTasksBackend
::
new
(
BackendOptions
::
default
(),
noop_backing_storage
(),
));
tt
.run_once
(
async
move
{
let
fs
=
DiskFileSystem
::
new
(
rcstr!
(
"test"
),
root
)
.to_resolved
()
.await
?
;
let
root_path
=
fs
.root
()
.owned
()
.await
?
;
let
write_result
=
test_write_link_effect
(
fs
,
root_path
.clone
(),
rcstr!
(
"subdir-a"
));
write_result
.read_strongly_consistent
()
.await
?
;
apply_effects
(
write_result
)
.await
?
;
assert_eq!
(
read_to_string
(
path
.join
(
"symlink-file"
))
.unwrap
(),
"foo"
);
assert_eq!
(
read_to_string
(
path
.join
(
"symlink-dir/data.txt"
))
.unwrap
(),
"foo"
);
// Write the same links again but with different targets
let
write_result
=
test_write_link_effect
(
fs
,
root_path
,
rcstr!
(
"subdir-b"
));
write_result
.read_strongly_consistent
()
.await
?
;
apply_effects
(
write_result
)
.await
?
;
assert_eq!
(
read_to_string
(
path
.join
(
"symlink-file"
))
.unwrap
(),
"bar"
);
assert_eq!
(
read_to_string
(
path
.join
(
"symlink-dir/data.txt"
))
.unwrap
(),
"bar"
);
anyhow
::
Ok
(())
})
.await
.unwrap
();
}
}
// Tests helpers for denied_path tests
#[cfg(test)]
#[cfg(test)]
mod
denied_path_tests
{
mod
denied_path_tests
{
use
std
::{
use
std
::{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment