You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/06/05 19:53:38 UTC
spark git commit: Revert "[MINOR] [BUILD] Use custom temp directory
during build."
Repository: spark
Updated Branches:
refs/heads/master 12f5eaeee -> 4036d05ce
Revert "[MINOR] [BUILD] Use custom temp directory during build."
This reverts commit b16b5434ff44c42e4b3a337f9af147669ba44896.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4036d05c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4036d05c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4036d05c
Branch: refs/heads/master
Commit: 4036d05ceeec77ebfa9c683cbc699250df3e3895
Parents: 12f5eae
Author: Andrew Or <an...@databricks.com>
Authored: Fri Jun 5 10:53:32 2015 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Fri Jun 5 10:53:32 2015 -0700
----------------------------------------------------------------------
.../spark/deploy/SparkSubmitUtilsSuite.scala | 22 +++++++++-----------
pom.xml | 4 +---
project/SparkBuild.scala | 1 -
3 files changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/4036d05c/core/src/test/scala/org/apache/spark/deploy/SparkSubmitUtilsSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/deploy/SparkSubmitUtilsSuite.scala b/core/src/test/scala/org/apache/spark/deploy/SparkSubmitUtilsSuite.scala
index 07d261c..8fda5c8 100644
--- a/core/src/test/scala/org/apache/spark/deploy/SparkSubmitUtilsSuite.scala
+++ b/core/src/test/scala/org/apache/spark/deploy/SparkSubmitUtilsSuite.scala
@@ -28,12 +28,9 @@ import org.apache.ivy.plugins.resolver.IBiblioResolver
import org.apache.spark.SparkFunSuite
import org.apache.spark.deploy.SparkSubmitUtils.MavenCoordinate
-import org.apache.spark.util.Utils
class SparkSubmitUtilsSuite extends SparkFunSuite with BeforeAndAfterAll {
- private var tempIvyPath: String = _
-
private val noOpOutputStream = new OutputStream {
def write(b: Int) = {}
}
@@ -50,7 +47,6 @@ class SparkSubmitUtilsSuite extends SparkFunSuite with BeforeAndAfterAll {
super.beforeAll()
// We don't want to write logs during testing
SparkSubmitUtils.printStream = new BufferPrintStream
- tempIvyPath = Utils.createTempDir(namePrefix = "ivy").getAbsolutePath()
}
test("incorrect maven coordinate throws error") {
@@ -94,20 +90,21 @@ class SparkSubmitUtilsSuite extends SparkFunSuite with BeforeAndAfterAll {
}
test("ivy path works correctly") {
+ val ivyPath = "dummy" + File.separator + "ivy"
val md = SparkSubmitUtils.getModuleDescriptor
val artifacts = for (i <- 0 until 3) yield new MDArtifact(md, s"jar-$i", "jar", "jar")
- var jPaths = SparkSubmitUtils.resolveDependencyPaths(artifacts.toArray, new File(tempIvyPath))
+ var jPaths = SparkSubmitUtils.resolveDependencyPaths(artifacts.toArray, new File(ivyPath))
for (i <- 0 until 3) {
- val index = jPaths.indexOf(tempIvyPath)
+ val index = jPaths.indexOf(ivyPath)
assert(index >= 0)
- jPaths = jPaths.substring(index + tempIvyPath.length)
+ jPaths = jPaths.substring(index + ivyPath.length)
}
val main = MavenCoordinate("my.awesome.lib", "mylib", "0.1")
IvyTestUtils.withRepository(main, None, None) { repo =>
// end to end
val jarPath = SparkSubmitUtils.resolveMavenCoordinates(main.toString, Option(repo),
- Option(tempIvyPath), true)
- assert(jarPath.indexOf(tempIvyPath) >= 0, "should use non-default ivy path")
+ Option(ivyPath), true)
+ assert(jarPath.indexOf(ivyPath) >= 0, "should use non-default ivy path")
}
}
@@ -126,12 +123,13 @@ class SparkSubmitUtilsSuite extends SparkFunSuite with BeforeAndAfterAll {
assert(jarPath.indexOf("mylib") >= 0, "should find artifact")
}
// Local ivy repository with modified home
- val dummyIvyLocal = new File(tempIvyPath, "local" + File.separator)
+ val dummyIvyPath = "dummy" + File.separator + "ivy"
+ val dummyIvyLocal = new File(dummyIvyPath, "local" + File.separator)
IvyTestUtils.withRepository(main, None, Some(dummyIvyLocal), true) { repo =>
val jarPath = SparkSubmitUtils.resolveMavenCoordinates(main.toString, None,
- Some(tempIvyPath), true)
+ Some(dummyIvyPath), true)
assert(jarPath.indexOf("mylib") >= 0, "should find artifact")
- assert(jarPath.indexOf(tempIvyPath) >= 0, "should be in new ivy path")
+ assert(jarPath.indexOf(dummyIvyPath) >= 0, "should be in new ivy path")
}
}
http://git-wip-us.apache.org/repos/asf/spark/blob/4036d05c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a848def..e28d4b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,7 @@
<parquet.deps.scope>compile</parquet.deps.scope>
<!--
- Overridable test home. So that you can call individual pom files directly without
+ Overridable test home. So that you can call individual pom files directory without
things breaking.
-->
<spark.test.home>${session.executionRootDirectory}</spark.test.home>
@@ -1256,7 +1256,6 @@
<systemProperties>
<derby.system.durability>test</derby.system.durability>
<java.awt.headless>true</java.awt.headless>
- <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.ui.enabled>false</spark.ui.enabled>
@@ -1290,7 +1289,6 @@
<systemProperties>
<derby.system.durability>test</derby.system.durability>
<java.awt.headless>true</java.awt.headless>
- <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.ui.enabled>false</spark.ui.enabled>
http://git-wip-us.apache.org/repos/asf/spark/blob/4036d05c/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 921f159..ef3a175 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -496,7 +496,6 @@ object TestSettings {
"SPARK_DIST_CLASSPATH" ->
(fullClasspath in Test).value.files.map(_.getAbsolutePath).mkString(":").stripSuffix(":"),
"JAVA_HOME" -> sys.env.get("JAVA_HOME").getOrElse(sys.props("java.home"))),
- javaOptions in Test += s"-Djava.io.tmpdir=$sparkHome/target/tmp",
javaOptions in Test += "-Dspark.test.home=" + sparkHome,
javaOptions in Test += "-Dspark.testing=1",
javaOptions in Test += "-Dspark.port.maxRetries=100",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org