Skip to content

[SPARK-20816][CORE] MetricsConfig doen't trim the properties file cau… #18041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SPARK-20816][CORE] MetricsConfig doen't trim the properties file cau… #18041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/metrics/MetricsConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ private[spark] class MetricsConfig(conf: SparkConf) extends Logging {
val prefix = "spark.metrics.conf."
conf.getAll.foreach {
case (k, v) if k.startsWith(prefix) =>
properties.setProperty(k.substring(prefix.length()), v)
properties.setProperty(k.substring(prefix.length()).trim(), v.trim())
case _ =>
}

Expand All @@ -78,7 +78,7 @@ private[spark] class MetricsConfig(conf: SparkConf) extends Logging {
val defaultSubProperties = perInstanceSubProperties(DEFAULT_PREFIX).asScala
for ((instance, prop) <- perInstanceSubProperties if (instance != DEFAULT_PREFIX);
(k, v) <- defaultSubProperties if (prop.get(k) == null)) {
prop.put(k, v)
prop.put(k.trim(), v.trim())
}
}
}
Expand Down
14 changes: 14 additions & 0 deletions core/src/test/scala/org/apache/spark/metrics/MetricsConfigSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,20 @@ class MetricsConfigSuite extends SparkFunSuite with BeforeAndAfter {
assert(servletProps.size() === 2)
}

test("MetricsConfig with properties with spaces") {
val sparkConf = new SparkConf(loadDefaults = false)
setMetricsProperty(sparkConf, "*.sink.console.class",
" org.apache.spark.metrics.sink.ConsoleSink ")
setMetricsProperty(sparkConf, "*.sink.console.period", "10 ")
val conf = new MetricsConfig(sparkConf)
conf.initialize()

val property = conf.getInstance("random")
assert(property.getProperty("sink.console.class") ===
"org.apache.spark.metrics.sink.ConsoleSink")
assert(property.getProperty("sink.console.period") === "10")
}

private def setMetricsProperty(conf: SparkConf, name: String, value: String): Unit = {
conf.set(s"spark.metrics.conf.$name", value)
}
Expand Down