diff options
| author | Syed Hashmi <shashmi@cloudera.com> | 2014-06-03 12:04:47 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-06-03 12:04:47 -0700 |
| commit | 7782a304ad105ec95cf62cb799e365e5fb385a69 (patch) | |
| tree | 223ba7bf21bbcb5bb7477d811ef3aa89b3dcd59f /streaming/src/main | |
| parent | 862283e9ccace6824880aa4e161723fb3248d438 (diff) | |
| download | spark-7782a304ad105ec95cf62cb799e365e5fb385a69.tar.gz spark-7782a304ad105ec95cf62cb799e365e5fb385a69.tar.bz2 spark-7782a304ad105ec95cf62cb799e365e5fb385a69.zip | |
[SPARK-1942] Stop clearing spark.driver.port in unit tests
stop resetting spark.driver.port in unit tests (scala, java and python).
Author: Syed Hashmi <shashmi@cloudera.com>
Author: CodingCat <zhunansjtu@gmail.com>
Closes #943 from syedhashmi/master and squashes the following commits:
885f210 [Syed Hashmi] Removing unnecessary file (created by mergetool)
b8bd4b5 [Syed Hashmi] Merge remote-tracking branch 'upstream/master'
b895e59 [Syed Hashmi] Revert "[SPARK-1784] Add a new partitioner"
57b6587 [Syed Hashmi] Revert "[SPARK-1784] Add a balanced partitioner"
1574769 [Syed Hashmi] [SPARK-1942] Stop clearing spark.driver.port in unit tests
4354836 [Syed Hashmi] Revert "SPARK-1686: keep schedule() calling in the main thread"
fd36542 [Syed Hashmi] [SPARK-1784] Add a balanced partitioner
6668015 [CodingCat] SPARK-1686: keep schedule() calling in the main thread
4ca94cc [Syed Hashmi] [SPARK-1784] Add a new partitioner
Diffstat (limited to 'streaming/src/main')
| -rw-r--r-- | streaming/src/main/scala/org/apache/spark/streaming/util/MasterFailureTest.scala | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/util/MasterFailureTest.scala b/streaming/src/main/scala/org/apache/spark/streaming/util/MasterFailureTest.scala index b3ed302db6..98e17ff92e 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/util/MasterFailureTest.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/util/MasterFailureTest.scala @@ -187,7 +187,6 @@ object MasterFailureTest extends Logging { setupCalled = true // Setup the streaming computation with the given operation - System.clearProperty("spark.driver.port") val ssc = new StreamingContext("local[4]", "MasterFailureTest", batchDuration, null, Nil, Map()) ssc.checkpoint(checkpointDir.toString) |