Skip to content
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

Jump to bottom

[SPARK-46498][CORE] Remove shuffleServiceEnabled from o.a.spark.util.Utils#getConfiguredLocalDirs #44475

Closed
wants to merge 4 commits into from
Closed

[SPARK-46498][CORE] Remove shuffleServiceEnabled from o.a.spark.util.Utils#getConfiguredLocalDirs #44475

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6aa27bb
init
LuciferYang Dec 22, 2023
640ea6e
import
LuciferYang Dec 22, 2023
ea9db25
Merge branch 'apache:master' into utils-useless
LuciferYang Dec 25, 2023
904c7d7
revert
LuciferYang Dec 26, 2023
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
28 changes: 1 addition & 27 deletions core/src/main/scala/org/apache/spark/util/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import org.slf4j.Logger

import org.apache.spark._
import org.apache.spark.deploy.SparkHadoopUtil
import org.apache.spark.internal.{config, Logging}
import org.apache.spark.internal.Logging
import org.apache.spark.internal.config._
import org.apache.spark.internal.config.Streaming._
import org.apache.spark.internal.config.Tests.IS_TESTING
Expand Down Expand Up @@ -769,7 +769,6 @@ private[spark] object Utils
* logic of locating the local directories according to deployment mode.
*/
def getConfiguredLocalDirs(conf: SparkConf): Array[String] = {
val shuffleServiceEnabled = conf.get(config.SHUFFLE_SERVICE_ENABLED)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be clear, this is enough for a valid PR. We can merge if we have only this removal.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

if (isRunningInYarnContainer(conf)) {
// If we are in yarn mode, systems can have different disk layouts so we must set it
// to what Yarn on this system said was available. Note this assumes that Yarn has
Expand Down Expand Up @@ -1885,17 +1884,6 @@ private[spark] object Utils
}
}

/** Check whether a path is an absolute URI. */
def isAbsoluteURI(path: String): Boolean = {
try {
val uri = new URI(path: String)
uri.isAbsolute
} catch {
case _: URISyntaxException =>
false
}
}

/** Return all non-local paths from a comma-separated list of paths. */
def nonLocalPaths(paths: String, testWindows: Boolean = false): Array[String] = {
val windows = isWindows || testWindows
Expand Down Expand Up @@ -1932,20 +1920,6 @@ private[spark] object Utils
path
}

/**
* Updates Spark config with properties from a set of Properties.
* Provided properties have the highest priority.
*/
def updateSparkConfigFromProperties(
conf: SparkConf,
properties: Map[String, String]) : Unit = {
properties.filter { case (k, v) =>
k.startsWith("spark.")
}.foreach { case (k, v) =>
conf.set(k, v)
}
}

/**
* Implements the same logic as JDK `java.lang.String#trim` by removing leading and trailing
* non-printable characters less or equal to '\u0020' (SPACE) but preserves natural line
Expand Down