Skip to content

Commit a1aa23c

Browse files
committed
[SPARK-26998][CORE] Remove SSL configuration from executors
1 parent 23e0908 commit a1aa23c

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,6 @@ private[spark] object SparkConf extends Logging {
740740
*/
741741
def isExecutorStartupConf(name: String): Boolean = {
742742
(name.startsWith("spark.auth") && name != SecurityManager.SPARK_AUTH_SECRET_CONF) ||
743-
name.startsWith("spark.ssl") ||
744743
name.startsWith("spark.rpc") ||
745744
name.startsWith("spark.network") ||
746745
isSparkPortConf(name)

core/src/test/scala/org/apache/spark/SparkConfSuite.scala

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,20 @@ class SparkConfSuite extends SparkFunSuite with LocalSparkContext with ResetSyst
354354
}
355355
}
356356

357+
test("SPARK-26998: SSL configuration not needed on executors") {
358+
val conf = new SparkConf(false)
359+
conf.validateSettings()
360+
361+
conf.set("spark.ssl.enabled", "true")
362+
conf.set("spark.ssl.keyPassword", "password")
363+
conf.set("spark.ssl.keyStorePassword", "password")
364+
conf.set("spark.ssl.trustStorePassword", "password")
365+
conf.validateSettings()
366+
367+
val filtered = conf.getAll.filter { case (k, _) => SparkConf.isExecutorStartupConf(k) }
368+
assert(filtered.isEmpty)
369+
}
370+
357371
val defaultIllegalValue = "SomeIllegalValue"
358372
val illegalValueTests : Map[String, (SparkConf, String) => Any] = Map(
359373
"getTimeAsSeconds" -> (_.getTimeAsSeconds(_)),

0 commit comments

Comments
 (0)