Skip to content

Commit d80e5dd

Browse files
committed
address comments
1 parent e1ff4cc commit d80e5dd

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S
8888
/** Default properties present in the currently defined defaults file. */
8989
lazy val defaultSparkProperties: HashMap[String, String] = {
9090
val defaultProperties = new HashMap[String, String]()
91-
if (verbose) {
91+
if (verbose && propertiesFile != null) {
9292
logInfo(log"Using properties file: ${MDC(PATH, propertiesFile)}")
9393
}
9494
Option(propertiesFile).foreach { filename =>

docs/core-migration-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ license: |
5050

5151
- Since Spark 4.0, Spark performs speculative executions less aggressively with `spark.speculation.multiplier=3` and `spark.speculation.quantile=0.9`. To restore the legacy behavior, you can set `spark.speculation.multiplier=1.5` and `spark.speculation.quantile=0.75`.
5252

53-
- Since Spark 4.0, when configurations are provided to `spark-submit` or `spark-shell` via `--properties-file` parameter, Spark will also load extra configurations from `SPARK_CONF_DIR/spark-defaults.conf`. Those configurations defined in the former take higher precedence over those from the latter.
53+
- Since Spark 4.0, when configurations are provided to `spark-submit` or `spark-shell` via `--properties-file` parameter, Spark will also load extra configurations from `SPARK_CONF_DIR/spark-defaults.conf`. Those configurations defined in the former take higher precedence over those from the latter. Other components such as Spark thrift server, connect server, SQL shell that call `spark-submit` internally will also have the same behavior change.
5454

5555
## Upgrading from Core 3.4 to 3.5
5656

0 commit comments

Comments
 (0)