Repository: spark Updated Branches: refs/heads/master 4fbf748bf -> ca00cc70d
[SPARK-21963][CORE][TEST] Create temp file should be delete after use ## What changes were proposed in this pull request? After you create a temporary table, you need to delete it, otherwise it will leave a file similar to the file name âSPARK194465907929586320484966tempâ. ## How was this patch tested? N / A Author: caoxuewen <cao.xue...@zte.com.cn> Closes #19174 from heary-cao/DeleteTempFile. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ca00cc70 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ca00cc70 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ca00cc70 Branch: refs/heads/master Commit: ca00cc70d6f01c0253a5bc2c22089cc54b476462 Parents: 4fbf748 Author: caoxuewen <cao.xue...@zte.com.cn> Authored: Wed Sep 13 13:01:30 2017 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Wed Sep 13 13:01:30 2017 +0100 ---------------------------------------------------------------------- .../scala/org/apache/spark/SparkContextSuite.scala | 1 + .../apache/spark/security/CryptoStreamUtilsSuite.scala | 1 + .../test/scala/org/apache/spark/util/UtilsSuite.scala | 1 + .../apache/spark/launcher/ChildProcAppHandleSuite.java | 13 +++++++++++-- 4 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/ca00cc70/core/src/test/scala/org/apache/spark/SparkContextSuite.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/org/apache/spark/SparkContextSuite.scala b/core/src/test/scala/org/apache/spark/SparkContextSuite.scala index 890e93d..0ed5f26 100644 --- a/core/src/test/scala/org/apache/spark/SparkContextSuite.scala +++ b/core/src/test/scala/org/apache/spark/SparkContextSuite.scala @@ -600,6 +600,7 @@ class SparkContextSuite extends SparkFunSuite with LocalSparkContext with Eventu val fs = new DebugFilesystem() fs.initialize(new URI("file:///"), new Configuration()) val file = File.createTempFile("SPARK19446", "temp") + file.deleteOnExit() Files.write(Array.ofDim[Byte](1000), file) val path = new Path("file:///" + file.getCanonicalPath) val stream = fs.open(path) http://git-wip-us.apache.org/repos/asf/spark/blob/ca00cc70/core/src/test/scala/org/apache/spark/security/CryptoStreamUtilsSuite.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/org/apache/spark/security/CryptoStreamUtilsSuite.scala b/core/src/test/scala/org/apache/spark/security/CryptoStreamUtilsSuite.scala index 608052f..78f618f 100644 --- a/core/src/test/scala/org/apache/spark/security/CryptoStreamUtilsSuite.scala +++ b/core/src/test/scala/org/apache/spark/security/CryptoStreamUtilsSuite.scala @@ -130,6 +130,7 @@ class CryptoStreamUtilsSuite extends SparkFunSuite { val conf = createConf() val key = createKey(conf) val file = Files.createTempFile("crypto", ".test").toFile() + file.deleteOnExit() val outStream = createCryptoOutputStream(new FileOutputStream(file), conf, key) try { http://git-wip-us.apache.org/repos/asf/spark/blob/ca00cc70/core/src/test/scala/org/apache/spark/util/UtilsSuite.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/org/apache/spark/util/UtilsSuite.scala b/core/src/test/scala/org/apache/spark/util/UtilsSuite.scala index 4ce143f..05d58d8 100644 --- a/core/src/test/scala/org/apache/spark/util/UtilsSuite.scala +++ b/core/src/test/scala/org/apache/spark/util/UtilsSuite.scala @@ -939,6 +939,7 @@ class UtilsSuite extends SparkFunSuite with ResetSystemProperties with Logging { // creating a very misbehaving process. It ignores SIGTERM and has been SIGSTOPed. On // older versions of java, this will *not* terminate. val file = File.createTempFile("temp-file-name", ".tmp") + file.deleteOnExit() val cmd = s""" |#!/bin/bash http://git-wip-us.apache.org/repos/asf/spark/blob/ca00cc70/launcher/src/test/java/org/apache/spark/launcher/ChildProcAppHandleSuite.java ---------------------------------------------------------------------- diff --git a/launcher/src/test/java/org/apache/spark/launcher/ChildProcAppHandleSuite.java b/launcher/src/test/java/org/apache/spark/launcher/ChildProcAppHandleSuite.java index 3b4d1b0..9f59b41 100644 --- a/launcher/src/test/java/org/apache/spark/launcher/ChildProcAppHandleSuite.java +++ b/launcher/src/test/java/org/apache/spark/launcher/ChildProcAppHandleSuite.java @@ -114,6 +114,7 @@ public class ChildProcAppHandleSuite extends BaseSuite { assumeFalse(isWindows()); Path err = Files.createTempFile("stderr", "txt"); + err.toFile().deleteOnExit(); SparkAppHandle handle = (ChildProcAppHandle) new TestSparkLauncher() .redirectError(err.toFile()) @@ -129,6 +130,7 @@ public class ChildProcAppHandleSuite extends BaseSuite { assumeFalse(isWindows()); Path out = Files.createTempFile("stdout", "txt"); + out.toFile().deleteOnExit(); SparkAppHandle handle = (ChildProcAppHandle) new TestSparkLauncher() .redirectOutput(out.toFile()) @@ -145,6 +147,8 @@ public class ChildProcAppHandleSuite extends BaseSuite { Path out = Files.createTempFile("stdout", "txt"); Path err = Files.createTempFile("stderr", "txt"); + out.toFile().deleteOnExit(); + err.toFile().deleteOnExit(); ChildProcAppHandle handle = (ChildProcAppHandle) new TestSparkLauncher() .redirectError(err.toFile()) @@ -159,9 +163,11 @@ public class ChildProcAppHandleSuite extends BaseSuite { @Test(expected = IllegalArgumentException.class) public void testBadLogRedirect() throws Exception { + File out = Files.createTempFile("stdout", "txt").toFile(); + out.deleteOnExit(); new SparkLauncher() .redirectError() - .redirectOutput(Files.createTempFile("stdout", "txt").toFile()) + .redirectOutput(out) .redirectToLog("foo") .launch() .waitFor(); @@ -169,9 +175,11 @@ public class ChildProcAppHandleSuite extends BaseSuite { @Test(expected = IllegalArgumentException.class) public void testRedirectErrorTwiceFails() throws Exception { + File err = Files.createTempFile("stderr", "txt").toFile(); + err.deleteOnExit(); new SparkLauncher() .redirectError() - .redirectError(Files.createTempFile("stderr", "txt").toFile()) + .redirectError(err) .launch() .waitFor(); } @@ -180,6 +188,7 @@ public class ChildProcAppHandleSuite extends BaseSuite { public void testProcMonitorWithOutputRedirection() throws Exception { assumeFalse(isWindows()); File err = Files.createTempFile("out", "txt").toFile(); + err.deleteOnExit(); SparkAppHandle handle = new TestSparkLauncher() .redirectError() .redirectOutput(err) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
