Skip to content

Commit 84cc5e5

Browse files
committed
Small clean-up
1 parent 1f75238 commit 84cc5e5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

core/src/main/scala/org/apache/spark/SparkConf.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
5252
}
5353
}
5454

55+
validateSettings()
56+
5557
/** Set a configuration variable. */
5658
def set(key: String, value: String): SparkConf = {
5759
if (key == null) {
@@ -209,7 +211,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
209211
}
210212

211213
/** Checks for illegal or deprecated config settings. Throws an exception for the former. */
212-
private[spark] def validateSettings() {
214+
private def validateSettings() {
213215
if (settings.contains("spark.local.dir")) {
214216
val msg = "In Spark 1.0 and later spark.local.dir will be overridden by the value set by " +
215217
"the cluster manager (via SPARK_LOCAL_DIRS in mesos/standalone and LOCAL_DIRS in YARN)."

yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ExecutorLauncher.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ class ExecutorLauncher(args: ApplicationMasterArguments, conf: Configuration, sp
237237
}
238238

239239
def finishApplicationMaster(status: FinalApplicationStatus) {
240-
logInfo("finish ApplicationEMaster with " + status)
240+
logInfo("finish ApplicationMaster with " + status)
241241
amClient.unregisterApplicationMaster(status, "" /* appMessage */ , "" /* appTrackingUrl */)
242242
}
243243

0 commit comments

Comments
 (0)