spark-defaults.properties -> spark-defaults.conf

Author: pwendell

.rat-excludes

@@ -11,7 +11,7 @@ RELEASE
 control
 docs
 fairscheduler.xml.template
-spark-defaults.properties.template
+spark-defaults.conf.template
 log4j.properties
 log4j.properties.template
 metrics.properties.template

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

@@ -244,7 +244,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
           |This has undefined behavior when running on a cluster and is deprecated in Spark 1.0+.
           |
           |Please instead use:
-          | - ./spark-submit with conf/spark-defaults.properties to set defaults for an application
+          | - ./spark-submit with conf/spark-defaults.conf to set defaults for an application
           | - ./spark-submit with --driver-java-options to set -X options for a driver
           | - spark.executor.extraJavaOptions to set -X options for executors
           | - SPARK_DAEMON_OPTS to set java options for standalone daemons (i.e. master, worker)

core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala

@@ -82,7 +82,7 @@ private[spark] class SparkSubmitArguments(args: Array[String]) {
     if (propertiesFile == null) {
       sys.env.get("SPARK_HOME").foreach { sparkHome =>
         val sep = File.separator
-        val defaultPath = s"${sparkHome}${sep}conf${sep}spark-defaults.properties"
+        val defaultPath = s"${sparkHome}${sep}conf${sep}spark-defaults.conf"
         val file = new File(defaultPath)
         if (file.exists()) {
           propertiesFile = file.getAbsolutePath
@@ -283,7 +283,7 @@ private[spark] class SparkSubmitArguments(args: Array[String]) {
         |  --files FILES               Comma separated list of files to be placed in the working dir
         |                              of each executor.
         |  --properties-file FILE      Path to a file from which to load extra properties. If not
-        |                              specified, this will look for conf/spark-defaults.properties.
+        |                              specified, this will look for conf/spark-defaults.conf.
         |
         |  --driver-memory MEM         Memory for driver (e.g. 1000M, 2G) (Default: 512M).
         |  --driver-java-options       Extra Java options to pass to the driver

docs/cluster-overview.md

@@ -103,7 +103,7 @@ HADOOP_CONF_DIR=XX /bin/spark-submit my-app.jar \
 
 The `spark-submit` script can load default `SparkConf` values from a properties file and pass them
 onto your application. By default it will read configuration options from
-`conf/spark-defaults.properties`. Any values specified in the file will be passed on to the
+`conf/spark-defaults.conf`. Any values specified in the file will be passed on to the
 application when run. They can obviate the need for certain flags to `spark-submit`: for
 instance, if `spark.master` property is set, you can safely omit the
 `--master` flag from `spark-submit`. In general, configuration values explicitly set on a

docs/configuration.md

@@ -659,7 +659,7 @@ Apart from these, the following properties are also available, and may be useful
     A string of extra JVM options to pass to executors. For instance, GC settings or other
     logging. Note that it is illegal to set Spark properties or heap size settings with this 
     option. Spark properties should be set using a SparkConf object or the 
-    spark-defaults.properties file used with the spark-submit script. Heap size settings can be set
+    spark-defaults.conf file used with the spark-submit script. Heap size settings can be set
     with spark.executor.memory.
   </td>
 </tr>