Skip to content

[GLUTEN-10707] Improve SparkDirectoryUtil by reduce synchronized #10708

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
zhztheplayer merged 2 commits into from
Oct 13, 2025
Merged

[GLUTEN-10707] Improve SparkDirectoryUtil by reduce synchronized #10708

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a6c746
[GLUTEN-10707] Improve SparkDirectoryUtil by reduce synchronized
beliefer Sep 18, 2025
bbcc3e4
Replace targetRoots with roots
beliefer Oct 11, 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
25 changes: 13 additions & 12 deletions gluten-core/src/main/scala/org/apache/spark/util/SparkDirectoryUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,30 +67,31 @@ class SparkDirectoryUtil private (val roots: Array[String]) extends Logging {
}

object SparkDirectoryUtil extends Logging {
private var INSTANCE: SparkDirectoryUtil = _
@volatile private var roots: Array[String] = _
private lazy val INSTANCE: SparkDirectoryUtil = {
if (this.roots == null) {
throw new IllegalStateException("SparkDirectoryUtil not initialized")
}
new SparkDirectoryUtil(this.roots)
}

def init(conf: SparkConf): Unit = synchronized {
def init(conf: SparkConf): Unit = {
val roots = Utils.getConfiguredLocalDirs(conf)
init(roots)
}

private def init(roots: Array[String]): Unit = synchronized {
if (INSTANCE == null) {
INSTANCE = new SparkDirectoryUtil(roots)
return
}
if (INSTANCE.roots.toSet != roots.toSet) {
if (this.roots == null) {
this.roots = roots
} else if (this.roots.toSet != roots.toSet) {
throw new IllegalArgumentException(
s"Reinitialize SparkDirectoryUtil with different root dirs: old: ${INSTANCE.ROOTS
s"Reinitialize SparkDirectoryUtil with different root dirs: old: ${this.roots
.mkString("Array(", ", ", ")")}, new: ${roots.mkString("Array(", ", ", ")")}"
)
}
}

def get(): SparkDirectoryUtil = synchronized {
assert(INSTANCE != null, "Default instance of SparkDirectoryUtil was not set yet")
INSTANCE
}
def get(): SparkDirectoryUtil = INSTANCE
}

class Namespace(private val parents: Array[File], private val name: String) {
Expand Down