Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit e2e45dc

Browse files
committed
Clean up deprecated configuration
1 parent bb7b0fb commit e2e45dc

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/ConfigurationUtils.scala

-25
Original file line numberDiff line numberDiff line change
@@ -41,31 +41,6 @@ object ConfigurationUtils extends Logging {
4141
}).getOrElse(Map.empty[String, String])
4242
}
4343

44-
def combinePrefixedKeyValuePairsWithDeprecatedConf(
45-
sparkConf: SparkConf,
46-
prefix: String,
47-
deprecatedConf: OptionalConfigEntry[String],
48-
configType: String): Map[String, String] = {
49-
val deprecatedKeyValuePairsString = sparkConf.get(deprecatedConf)
50-
deprecatedKeyValuePairsString.foreach { _ =>
51-
logWarning(s"Configuration with key ${deprecatedConf.key} is deprecated. Use" +
52-
s" configurations with prefix $prefix<key> instead.")
53-
}
54-
val fromDeprecated = parseKeyValuePairs(
55-
deprecatedKeyValuePairsString,
56-
deprecatedConf.key,
57-
configType)
58-
val fromPrefix = sparkConf.getAllWithPrefix(prefix)
59-
val combined = fromDeprecated.toSeq ++ fromPrefix
60-
combined.groupBy(_._1).foreach {
61-
case (key, values) =>
62-
require(values.size == 1,
63-
s"Cannot have multiple values for a given $configType key, got key $key with" +
64-
s" values $values")
65-
}
66-
combined.toMap
67-
}
68-
6944
def parsePrefixedKeyValuePairs(
7045
sparkConf: SparkConf,
7146
prefix: String,

0 commit comments

Comments
 (0)