aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Or <andrew@databricks.com>2015-08-11 20:46:58 -0700
committerJosh Rosen <joshrosen@databricks.com>2015-08-11 20:46:58 -0700
commitca8f70e9d473d2c81866f3c330cc6545c33bdac7 (patch)
tree2fc5e8c736c6d94b55cb86906b4ba8e0d7954077
parentafa757c98c537965007cad4c61c436887f3ac6a6 (diff)
downloadspark-ca8f70e9d473d2c81866f3c330cc6545c33bdac7.tar.gz
spark-ca8f70e9d473d2c81866f3c330cc6545c33bdac7.tar.bz2
spark-ca8f70e9d473d2c81866f3c330cc6545c33bdac7.zip
[SPARK-9649] Fix flaky test MasterSuite again - disable REST
The REST server is not actually used in most tests and so we can disable it. It is a source of flakiness because it tries to bind to a specific port in vain. There was also some code that avoided the shuffle service in tests. This is actually not necessary because the shuffle service is already off by default. Author: Andrew Or <andrew@databricks.com> Closes #8084 from andrewor14/fix-master-suite-again.
-rw-r--r--pom.xml1
-rw-r--r--project/SparkBuild.scala1
2 files changed, 2 insertions, 0 deletions
diff --git a/pom.xml b/pom.xml
index 8942836a7d..cfd7d32563 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1895,6 +1895,7 @@
<java.io.tmpdir>${project.build.directory}/tmp</java.io.tmpdir>
<spark.test.home>${spark.test.home}</spark.test.home>
<spark.testing>1</spark.testing>
+ <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>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index cad7067ade..74f815f941 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -546,6 +546,7 @@ object TestSettings {
javaOptions in Test += "-Dspark.test.home=" + sparkHome,
javaOptions in Test += "-Dspark.testing=1",
javaOptions in Test += "-Dspark.port.maxRetries=100",
+ 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",