Repository: spark Updated Branches: refs/heads/branch-1.5 ec7a4b9b0 -> 0119edf52
[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 <and...@databricks.com> Closes #8084 from andrewor14/fix-master-suite-again. (cherry picked from commit ca8f70e9d473d2c81866f3c330cc6545c33bdac7) Signed-off-by: Josh Rosen <joshro...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0119edf5 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0119edf5 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0119edf5 Branch: refs/heads/branch-1.5 Commit: 0119edf52885c6c798cd00bf545f5b0b1f6910af Parents: ec7a4b9 Author: Andrew Or <and...@databricks.com> Authored: Tue Aug 11 20:46:58 2015 -0700 Committer: Josh Rosen <joshro...@databricks.com> Committed: Tue Aug 11 20:47:19 2015 -0700 ---------------------------------------------------------------------- pom.xml | 1 + project/SparkBuild.scala | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/0119edf5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8942836..cfd7d32 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> http://git-wip-us.apache.org/repos/asf/spark/blob/0119edf5/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index cad7067..74f815f 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", --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
