Skip to content

Commit 059ae0d

Browse files
author
Andrew Or
committed
Log deprecation warning for old memory fraction configs
1 parent 93c3cef commit 059ae0d

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
421421
val memoryKeys = Seq(
422422
"spark.memory.fraction",
423423
"spark.memory.storageFraction",
424-
// TODO: warn against these deprecated fractions
424+
// deprecated
425425
"spark.storage.memoryFraction",
426426
"spark.shuffle.memoryFraction",
427427
"spark.shuffle.safetyFraction",
@@ -512,6 +512,11 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
512512

513513
private[spark] object SparkConf extends Logging {
514514

515+
// Deprecation message for memory fraction configs used in the old memory management model
516+
private val deprecatedMemoryFractionMessage =
517+
"As of Spark 1.6, execution and storage memory management are unified. " +
518+
"All memory fractions used in the old model are now deprecated and no longer read."
519+
515520
/**
516521
* Maps deprecated config keys to information about the deprecation.
517522
*
@@ -528,7 +533,12 @@ private[spark] object SparkConf extends Logging {
528533
DeprecatedConfig("spark.kryoserializer.buffer.mb", "1.4",
529534
"Please use spark.kryoserializer.buffer instead. The default value for " +
530535
"spark.kryoserializer.buffer.mb was previously specified as '0.064'. Fractional values " +
531-
"are no longer accepted. To specify the equivalent now, one may use '64k'.")
536+
"are no longer accepted. To specify the equivalent now, one may use '64k'."),
537+
DeprecatedConfig("spark.shuffle.memoryFraction", "1.6", deprecatedMemoryFractionMessage),
538+
DeprecatedConfig("spark.shuffle.safetyFraction", "1.6", deprecatedMemoryFractionMessage),
539+
DeprecatedConfig("spark.storage.memoryFraction", "1.6", deprecatedMemoryFractionMessage),
540+
DeprecatedConfig("spark.storage.safetyFraction", "1.6", deprecatedMemoryFractionMessage),
541+
DeprecatedConfig("spark.storage.unrollFraction", "1.6", deprecatedMemoryFractionMessage)
532542
)
533543

534544
Map(configs.map { cfg => (cfg.key -> cfg) } : _*)

0 commit comments

Comments
 (0)