Skip to content

Fix race condition in local repo setup #3693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gedochao merged 1 commit into from
May 26, 2025
Merged

Fix race condition in local repo setup #3693

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions modules/build/src/main/scala/scala/build/LocalRepo.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,21 @@ object LocalRepo {

if !os.exists(repoDir) then
withLock((repoDir / os.up).toNIO, version) {
val tmpRepoDir = repoDir / os.up / s".$version.tmp"
try os.remove.all(tmpRepoDir)
catch {
case t: Throwable =>
logger.message(s"Error removing $tmpRepoDir: ${t.getMessage}")
}
using(archiveUrl.openStream()) { is =>
using(WrappedZipInputStream.create(new BufferedInputStream(is))) { zis =>
extractZip(zis, tmpRepoDir)
// Post-lock validation: Recheck repository directory existence to handle
// potential race conditions between initial check and lock acquisition
if !os.exists(repoDir) then
val tmpRepoDir = repoDir / os.up / s".$version.tmp"
try os.remove.all(tmpRepoDir)
catch {
case t: Throwable =>
logger.message(s"Error removing $tmpRepoDir: ${t.getMessage}")
}
}
os.move(tmpRepoDir, repoDir)
using(archiveUrl.openStream()) { is =>
using(WrappedZipInputStream.create(new BufferedInputStream(is))) { zis =>
extractZip(zis, tmpRepoDir)
}
}
os.move(tmpRepoDir, repoDir)
}

val repo = "ivy:" + repoDir.toNIO.toUri.toASCIIString + "/[defaultPattern]"
Expand Down