Repository: spark
Updated Branches:
  refs/heads/master f6dcc6e96 -> 1b6e938be


[SPARK-4424] Remove spark.driver.allowMultipleContexts override in tests

This patch removes `spark.driver.allowMultipleContexts=true` from our test 
configuration. The multiple SparkContexts check was originally disabled because 
certain tests suites in SQL needed to create multiple contexts. As far as I 
know, this configuration change is no longer necessary, so we should remove it 
in order to make it easier to find test cleanup bugs.

Author: Josh Rosen <[email protected]>

Closes #9865 from JoshRosen/SPARK-4424.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1b6e938b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1b6e938b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1b6e938b

Branch: refs/heads/master
Commit: 1b6e938be836786bac542fa430580248161e5403
Parents: f6dcc6e
Author: Josh Rosen <[email protected]>
Authored: Mon Nov 23 13:19:10 2015 -0800
Committer: Josh Rosen <[email protected]>
Committed: Mon Nov 23 13:19:10 2015 -0800

----------------------------------------------------------------------
 pom.xml                  | 2 --
 project/SparkBuild.scala | 1 -
 2 files changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/1b6e938b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ad84911..234fd5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1958,7 +1958,6 @@
               <spark.master.rest.enabled>false</spark.master.rest.enabled>
               <spark.ui.enabled>false</spark.ui.enabled>
               
<spark.ui.showConsoleProgress>false</spark.ui.showConsoleProgress>
-              
<spark.driver.allowMultipleContexts>true</spark.driver.allowMultipleContexts>
               
<spark.unsafe.exceptionOnMemoryLeak>true</spark.unsafe.exceptionOnMemoryLeak>
               <!-- Needed by sql/hive tests. -->
               <test.src.tables>src</test.src.tables>
@@ -1997,7 +1996,6 @@
               <spark.testing>1</spark.testing>
               <spark.ui.enabled>false</spark.ui.enabled>
               
<spark.ui.showConsoleProgress>false</spark.ui.showConsoleProgress>
-              
<spark.driver.allowMultipleContexts>true</spark.driver.allowMultipleContexts>
               
<spark.unsafe.exceptionOnMemoryLeak>true</spark.unsafe.exceptionOnMemoryLeak>
               <!-- Needed by sql/hive tests. -->
               <test.src.tables>__not_used__</test.src.tables>

http://git-wip-us.apache.org/repos/asf/spark/blob/1b6e938b/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 67724c4..f575f00 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -632,7 +632,6 @@ object TestSettings {
     javaOptions in Test += "-Dspark.master.rest.enabled=false",
     javaOptions in Test += "-Dspark.ui.enabled=false",
     javaOptions in Test += "-Dspark.ui.showConsoleProgress=false",
-    javaOptions in Test += "-Dspark.driver.allowMultipleContexts=true",
     javaOptions in Test += "-Dspark.unsafe.exceptionOnMemoryLeak=true",
     javaOptions in Test += "-Dsun.io.serialization.extendedDebugInfo=true",
     javaOptions in Test += "-Dderby.system.durability=test",


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to