Skip to content

Commit

Permalink
Move a bracket in validateSettings of SparkConf
Browse files Browse the repository at this point in the history
Move a bracket in validateSettings of SparkConf

Author: hzw19900416 <[email protected]>

Closes apache#2012 from hzw19900416/codereading and squashes the following commits:

e717fb6 [hzw19900416] Move a bracket in validateSettings of SparkConf
  • Loading branch information
SaintBacchus authored and JoshRosen committed Aug 19, 2014
1 parent 94053a7 commit 76eaeb4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/SparkConf.scala
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
// Validate spark.executor.extraJavaOptions
settings.get(executorOptsKey).map { javaOpts =>
if (javaOpts.contains("-Dspark")) {
val msg = s"$executorOptsKey is not allowed to set Spark options (was '$javaOpts)'. " +
val msg = s"$executorOptsKey is not allowed to set Spark options (was '$javaOpts'). " +
"Set them directly on a SparkConf or in a properties file when using ./bin/spark-submit."
throw new Exception(msg)
}
Expand Down

0 comments on commit 76eaeb4

Please sign in to comment.