Skip to content

Fix completely broken lock during setuping local repo on Linux #3846

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 2 commits into from
Sep 2, 2025
Merged

Fix completely broken lock during setuping local repo on Linux #3846

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97199dc
Fix completely broken lock during setuping local repo on Linux
unlsycn Aug 29, 2025
d7d77f7
Add test for parallel local repo setup
unlsycn Sep 1, 2025
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
31 changes: 9 additions & 22 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,11 +77,7 @@ object LocalRepo {
// 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.remove.all(tmpRepoDir)
using(archiveUrl.openStream()) { is =>
using(WrappedZipInputStream.create(new BufferedInputStream(is))) { zis =>
extractZip(zis, tmpRepoDir)
Expand All @@ -101,30 +97,21 @@ object LocalRepo {
val lockFile = dir.resolve(s".lock-$id");
Util.createDirectories(lockFile.getParent)
var channel: FileChannel = null
var lock: FileLock = null

try {
channel = FileChannel.open(
lockFile,
StandardOpenOption.CREATE,
StandardOpenOption.WRITE,
StandardOpenOption.DELETE_ON_CLOSE
StandardOpenOption.WRITE
)

var lock: FileLock = null
try {
lock = channel.lock()

try f
finally {
lock.release()
lock = null
channel.close()
channel = null
}
}
finally if (lock != null) lock.release()
lock = channel.lock()
f
}
finally {
if (lock != null) lock.release()
if (channel != null) channel.close()
}
finally if (channel != null) channel.close()
}

}