Skip to content
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

Jump to bottom

SPARK-5425: Use synchronised methods in system properties to create SparkConf #4220

Closed
wants to merge 3 commits into from
Closed

SPARK-5425: Use synchronised methods in system properties to create SparkConf #4220

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
685780e
SPARK-5425: Use synchronised methods in system properties to create S…
jacek-lewandowski Jan 27, 2015
74b4489
SPARK-5425: Use SerializationUtils to save properties in ResetSystemP…
jacek-lewandowski Jan 29, 2015
6c48a1f
SPARK-5425: Modified Utils.getSystemProperties to return a map of all…
jacek-lewandowski Feb 2, 2015
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
5 changes: 3 additions & 2 deletions core/src/main/scala/org/apache/spark/SparkConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {

if (loadDefaults) {
// Load any spark.* system properties
for ((k, v) <- System.getProperties.asScala if k.startsWith("spark.")) {
settings(k) = v
val propNames = System.getProperties.stringPropertyNames().asScala
for (k <- propNames if k.startsWith("spark.")) {
settings(k) = System.getProperty(k)
}
}

Expand Down
25 changes: 25 additions & 0 deletions core/src/test/scala/org/apache/spark/SparkConfSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

package org.apache.spark

import java.util.concurrent.{TimeUnit, Executors}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ultra nit: sort imports


import scala.util.{Try, Random}

import org.scalatest.FunSuite

import org.apache.spark.util.ResetSystemProperties
Expand Down Expand Up @@ -121,4 +125,25 @@ class SparkConfSuite extends FunSuite with LocalSparkContext with ResetSystemPro
assert(conf.get("spark.test.a.b") === "A.B")
assert(conf.get("spark.test.a.b.c") === "a.b.c")
}

test("Thread safeness - SPARK-5425") {
import scala.collection.JavaConversions._
val executor = Executors.newSingleThreadScheduledExecutor()
val sf = executor.scheduleAtFixedRate(new Runnable {
override def run(): Unit =
System.setProperty("spark.5425." + Random.nextInt(), Random.nextInt().toString)
}, 0, 1, TimeUnit.MILLISECONDS)

try {
val t0 = System.currentTimeMillis()
while ((System.currentTimeMillis() - t0) < 1000) {
val conf = Try(new SparkConf(loadDefaults = true))
assert(conf.isSuccess === true)
}
} finally {
executor.shutdownNow()
for (key <- System.getProperties.stringPropertyNames() if key.startsWith("spark.5425."))
System.getProperties.remove(key)
}
}
}